入库新增

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/SubcontractingOrderController.java

@@ -36,6 +36,58 @@ public class SubcontractingOrderController extends JeecgController<Subcontractin
     @Autowired
     private SubcontractingOrderService subcontractingOrderService;
 
+    /**
+     * 根据订单号获取委外订单详情 0000000003
+     */
+    @RequestMapping(value = "/toExamine",method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<ResHttpStatus> toExamine(String code,String cHandler) {
+
+        ResHttpStatus res = new ResHttpStatus();
+        res.setCode("0");
+        res.setSuccess(false);
+        if (!StringUtils.isNotBlank(code)) {
+            res.setMsg("订单号不能为空");
+            return new ResponseEntity<>(res, HttpStatus.OK);
+        }
+       if (!StringUtils.isNotBlank(cHandler)) {
+            res.setMsg("审核人姓名不能为空");
+            return new ResponseEntity<>(res, HttpStatus.OK);
+        }
+        int st = subcontractingOrderService.toExamine(code,cHandler);
+
+        res.setCode("200");
+        res.setMsg("成功");
+        res.setSuccess(true);
+        res.setData(st);
+
+        return new ResponseEntity<>(res, HttpStatus.OK);
+
+    }
+    /**
+     * 根据订单号获取委外订单详情 0000000003
+     */
+    @RequestMapping(value = "/selectRdRecord01ByCode",method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<ResHttpStatus> selectRdRecord01ByCode(String code) {
+
+        ResHttpStatus res = new ResHttpStatus();
+        res.setCode("0");
+        res.setSuccess(false);
+        if (!StringUtils.isNotBlank(code)) {
+            res.setMsg("订单号不能为空");
+            return new ResponseEntity<>(res, HttpStatus.OK);
+        }
+        Map<String,Object> map = subcontractingOrderService.selectRdRecord01ByCode(code);
+
+        res.setCode("200");
+        res.setMsg("成功");
+        res.setSuccess(true);
+        res.setData(map);
+
+        return new ResponseEntity<>(res, HttpStatus.OK);
+
+    }
     /**
      * 根据订单号获取委外订单详情
      */

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/entity/SubcontractingOrder.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.openApi.entity;
 
 import lombok.Data;
 
+/**
+ * 委外订单
+ */
 @Data
 public class SubcontractingOrder {
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/SubcontractingOrderMapper.java

@@ -50,4 +50,18 @@ public interface SubcontractingOrderMapper extends BaseMapper<SubcontractingOrde
      */
     void saveRdrecords01One(@Param("item")Map<String,Object> map);
 
+    /**
+     * 根据编码获取入库单数据
+     * @param code
+     * @return
+     */
+    Map<String,Object> selectRdRecord01ByCode(String code);
+    List<Map<String,Object>> selectRdChildById(String id);
+
+    /**
+     * 审核入库单
+     * @param code
+     * @return
+     */
+    int toExamine(@Param("code") String code,@Param("code")String cHandler);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/xml/SubcontractingOrderMapper.xml

@@ -114,7 +114,7 @@
             cAssUnit,--18 辅计量单位编码
             -- #{item.polishedBlank}, -- 19 光坯毛门幅CM
             -- #{item.gramWeight}, -- 20 克重/工艺
-            cFree4, -- 21 件数 总卷数
+            cFree5, -- 21 件数 总卷数
             cPOID--22 订单号
             )
             VALUES
@@ -144,5 +144,66 @@
             )
     </insert>
 
+    <select id="selectRdRecord01ByCode" resultType="map">
 
+        select ID,
+               bredvouch,-- 红蓝标识
+               cVouchType, -- 单据类型编码  01
+               cCode, -- 收发单据号
+               dDate, -- 单据日期 当前日期
+               cWhCode, -- 仓库编码
+               cOrderCode, -- 采购订单号
+               cARVCode, -- 采购到货单号
+               cVenCode, -- 供应商编码
+               cDepCode, -- 部门编码
+               cPersonCode, -- 业务员编码
+               dARVDate, -- 到货日期 空
+               cBusType, -- 业务类型   普通采购
+               cPTCode, -- 采购类型编码   01
+               cMemo, -- 备注
+               cRdCode, -- 收发类别编码 1
+               bredvouch,--红蓝标识--> 0
+               bRdFlag,--收发标志-- 1
+               cSource,--单据来源-->
+               bTransFlag,--是否传递 --> 0
+               bIsSTQc,--是否传递 --> 0
+               cMaker, -- 创建人 验布机
+               cHandler, -- 审核人 空
+               dVeriDate, -- 审核日期
+               dnverifytime, -- 审核时间
+               cDefine13 -- 委外订单号
+        from RdRecord01 where cCode = #{code}
+
+    </select>
+
+    <select id="selectRdChildById" resultType="map">
+
+        select AutoID, -- 子表主键
+               ID, -- 主表主键
+               cDefine22, -- 款号
+               cDefine28, -- 小PO 空
+               cInvCode, -- 存货编码
+               iQuantity,-- 数量
+               cBatch, -- 批号
+               cFree1, -- 颜色
+               cDefine30, -- 染厂色号
+               cbMemo, -- 备注
+               iordercode, -- 订单号
+               irowno, -- 行号
+               iFlag, --是否传递 --> 0
+               iMatSettleState, --结算状态 --> 0
+               iBillSettleCount, --结算次数 --> 0
+               iPOsID, -- 采购订单子表标识 空
+               iOMoDID, -- 委外订单子表ID  空
+               cPOID, -- 订单号
+               cAssUnit --辅计量单位编码
+        from rdrecords01 where id =#{id}
+
+    </select>
+
+    <update id="toExamine">
+        update RdRecord01 set cHandler =#{cHandler} ,dVeriDate = getdate() , dnverifytime = getdate()
+        where cCode = #{code}
+
+    </update>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/SubcontractingOrderService.java

@@ -18,4 +18,8 @@ public interface SubcontractingOrderService extends IService<SubcontractingOrder
     String callGetMaxCode(String StuNo);
 
     Map<String,Integer> callGetUAMaxPK(String StuNo);
+
+    Map<String,Object> selectRdRecord01ByCode(String code);
+
+    int toExamine(String code,String cHandler);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/SubcontractingOrderImpl.java

@@ -193,6 +193,30 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
         return "true";
     }
 
+    /**
+     * 根据编码获取入库单数据
+     * @param code
+     * @return
+     */
+    @DS("multi-one")
+    public Map<String,Object> selectRdRecord01ByCode(String code) {
+        Map<String,Object> map = subcontractingOrderMapper.selectRdRecord01ByCode(code);
+        if(map != null && map.get("ID") != null){
+            List<Map<String,Object>> item = subcontractingOrderMapper.selectRdChildById(map.get("ID").toString());
+            map.put("item",item);
+        }
+        return map;
+    }
+
+    /**
+     * 审核入库单
+     * @param code
+     * @return
+     */
+    @DS("multi-one")
+    public int toExamine(String code,String cHandler){
+        return subcontractingOrderMapper.toExamine(code,cHandler);
+    }
 
 //    public Integer getMaxId(String id, String tableName) {
 //        Integer maxId=purchaseWarehousingMapper.getMaxId(id,tableName);