报表

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

@@ -37,24 +37,28 @@ public class SubcontractingOrderController extends JeecgController<Subcontractin
     private SubcontractingOrderService subcontractingOrderService;
 
     /**
-     * 根据订单号获取委外订单详情 0000000003
+     * 根据订单号审核入库单 0000000003
      */
     @RequestMapping(value = "/toExamine",method = RequestMethod.GET)
     @ResponseBody
-    public ResponseEntity<ResHttpStatus> toExamine(String code,String cHandler) {
+    public ResponseEntity<ResHttpStatus> toExamine(String cbSysBarCode,String cHandler,String id) {
 
         ResHttpStatus res = new ResHttpStatus();
         res.setCode("0");
         res.setSuccess(false);
-        if (!StringUtils.isNotBlank(code)) {
-            res.setMsg("订单号不能为空");
+        if (!StringUtils.isNotBlank(cbSysBarCode)) {
+            res.setMsg("二维码参数有误");
+            return new ResponseEntity<>(res, HttpStatus.OK);
+        }
+        if (!StringUtils.isNotBlank(id)) {
+            res.setMsg("主表id不能为空");
             return new ResponseEntity<>(res, HttpStatus.OK);
         }
         if (!StringUtils.isNotBlank(cHandler)) {
             res.setMsg("审核人姓名不能为空");
             return new ResponseEntity<>(res, HttpStatus.OK);
         }
-        int st = subcontractingOrderService.toExamine(code,cHandler);
+        int st = subcontractingOrderService.toExamine(id,cbSysBarCode,cHandler);
 
         res.setCode("200");
         res.setMsg("成功");
@@ -65,20 +69,24 @@ public class SubcontractingOrderController extends JeecgController<Subcontractin
 
     }
     /**
-     * 根据订单号获取委外订单详情 0000000003
+     * 根据订单号获取入库单详情 （pda功能） 0000000003
      */
-    @RequestMapping(value = "/selectRdRecord01ByCode",method = RequestMethod.GET)
+    @RequestMapping(value = "/cbSysBarCode",method = RequestMethod.POST)
     @ResponseBody
-    public ResponseEntity<ResHttpStatus> selectRdRecord01ByCode(String code) {
-
+    public ResponseEntity<ResHttpStatus> selectRdAllByBar(@RequestBody JSONObject json) {
         ResHttpStatus res = new ResHttpStatus();
         res.setCode("0");
         res.setSuccess(false);
-        if (!StringUtils.isNotBlank(code)) {
-            res.setMsg("订单号不能为空");
+        if(json.size() == 0){
+            res.setMsg("参数不能为空");
+            return new ResponseEntity<>(res, HttpStatus.OK);
+        }
+        if(json.get("cbSysBarCode") == null){
+            res.setMsg("cbSysBarCode参数不能为空");
             return new ResponseEntity<>(res, HttpStatus.OK);
         }
-        Map<String,Object> map = subcontractingOrderService.selectRdRecord01ByCode(code);
+
+        Map<String,Object> map = subcontractingOrderService.selectRdAllByBar(json.getString("cbSysBarCode"));
 
         res.setCode("200");
         res.setMsg("成功");

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

@@ -79,10 +79,31 @@ public interface SubcontractingOrderMapper extends BaseMapper<SubcontractingOrde
     Map<String,Object> selectRdRecord01ByCode(String code);
     List<Map<String,Object>> selectRdChildById(String id);
 
+    /**
+     * pda根据子表二维码获取信息
+     * @param cbSysBarCode
+     * @return
+     */
+    Map<String,Object> selectRdAllByBar(String cbSysBarCode);
     /**
      * 审核入库单
-     * @param code
+     * @param cbSysBarCode
      * @return
      */
-    int toExamine(@Param("code") String code,@Param("cHandler")String cHandler);
+    int toExamine(@Param("id") String cbSysBarCode,@Param("cHandler")String cHandler);
+
+    /**
+     * 更新入库单审核标记
+     * @param cbSysBarCode
+     * @return
+     */
+    int updateDef(@Param("cbSysBarCode") String cbSysBarCode);
+
+    /**
+     * 查询是否还有未标记的入库单
+     * @param id
+     * @return
+     */
+    int selectNum(@Param("id") String id);
+
 }

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

@@ -11,7 +11,8 @@
     </select>
     
     <select id="selectInfoByCode" resultType="map">
-        select cVenCode,-- 供货单位
+        select id,
+               cVenCode,-- 供货单位
                cDepCode , -- 部门编码
                cPersonCode -- 业务员编码
         from OM_MOMain where ccode = #{code}
@@ -69,14 +70,17 @@
          bTransFlag,<!--15是否传递 0-->
          bIsSTQc,<!--16是否传递 0-->
          cMaker,<!--17创建人 验布机-->
-         cDefine13 <!-- 18委外订单号-->
+         cDefine13, <!-- 18委外订单号-->
+        ipurorderid, <!-- 19采购订单主表标识-->
+        dnmaketime, <!-- 20创建时间-->
+        cSysBarCode <!-- 主表二维码-->
         )
         VALUES (
         #{ID},
                 #{cVouchType},<!--1 单据类型编码 采购入库-->
                 #{cCode},<!--2 收发单据号-->
                 getdate(),<!--3 单据日期 当前日期-->
-                'W50081',<!--4 #{cWhCode}仓库编码-->
+                #{cWhCode},<!--4 'W50081'仓库编码-->
                 #{cOrderCode},<!--5 委外订单号 验布机-->
                 #{cVenCode}, <!--6 供应商编码-->
                 #{cDepCode},<!-- 7部门编码-->
@@ -90,8 +94,10 @@
                 0, <!--15是否传递 0-->
                 0, <!--16是否传递 0-->
                 '陈创',<!--17创建人 验布机-->
-                #{cOrderCode} <!-- 18委外订单号-->
-
+                #{cOrderCode}, <!-- 18委外订单号-->
+                #{ipurorderid}, <!-- 19采购订单主表标识-->
+                getdate(),<!--20 创建时间-->
+                #{cSysBarCode} <!-- 21二维码-->
                )
     </insert>
 
@@ -116,7 +122,8 @@
             cFree4, -- 19 光坯毛门幅CM
             cFree6, -- 20 克重/工艺
             cFree5, -- 21 件数 总卷数
-            cPOID --22 订单号
+            cPOID, --22 订单号
+            cbSysBarCode --22 订单号
             )
             VALUES
             (
@@ -138,7 +145,8 @@
             #{polishedBlank}, -- 19 光坯毛门幅CM
             #{gramWeight}, -- 20 克重/工艺
             #{num}, -- 21 件数 总卷数
-            #{cPOID}--22 订单号
+            #{cPOID},--22 订单号
+            #{cbSysBarCode}--22 订单号
             )
     </insert>
 
@@ -185,6 +193,7 @@
                cBatch, -- 批号
                cFree1, -- 颜色
                cDefine30, -- 染厂色号
+               cDefine31, -- 潘通色号
                cbMemo, -- 备注
                iordercode, -- 订单号
                irowno, -- 行号
@@ -199,9 +208,41 @@
 
     </select>
 
+    <select id="selectRdAllByBar" resultType="map">
+        select a.id,
+               a.dDate, -- 日期
+               c.cDepName, -- 部门
+               d.cPersonName, -- 业务员
+               a.cCode, -- 单号
+               f.cInvName, -- 品名
+               b.cFree6, -- 克重
+               b.cFree4, -- 门幅
+               b.cfree1, -- 颜色
+               b.cDefine31, -- 潘通色号
+               b.cDefine30, -- 染厂色号
+               b.cInvCode, -- 存货编码
+               b.cBatch -- 批号
+         from RdRecord01 a
+         left join rdrecords01 b on a.id = b.id
+         left join Department c on c.cDepCode = a.cDepCode
+         left join person d on d.cPersonCode = a.cPersonCode
+         left join Inventory f on f.cInvCode = b.cInvCode
+
+        where cbSysBarCode = #{cbSysBarCode} --'||st01|0000000003|1'
+
+    </select>
+
+    <update id="updateDef">
+        update rdrecords01 set cDefine37 = getdate() where cbSysBarCode = #{cbSysBarCode}
+    </update>
+
+    <select id="selectNum" resultType="int">
+        select count(1) from rdrecords01 where id = #{id} and (cDefine37 = '' or cDefine37 is null)
+    </select>
+
     <update id="toExamine">
         update RdRecord01 set cHandler =#{cHandler} ,dVeriDate = getdate() , dnverifytime = getdate()
-        where cCode = #{code}
-
+        where id = #{id}
     </update>
+
 </mapper>

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

@@ -21,5 +21,7 @@ public interface SubcontractingOrderService extends IService<SubcontractingOrder
 
     Map<String,Object> selectRdRecord01ByCode(String code);
 
-    int toExamine(String code,String cHandler);
+    Map<String,Object> selectRdAllByBar(String cbSysBarCode);
+
+    int toExamine(String id,String cbSysBarCode,String cHandler);
 }

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

@@ -53,7 +53,7 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     @DS("multi-three")
     public Map<String,Integer> callGetUAMaxPK(String StuNo) {
-        Map<String,Integer> map = subcontractingOrderMapper.callGetUAMaxPK(StuNo,"103");
+        Map<String,Integer> map = subcontractingOrderMapper.callGetUAMaxPK(StuNo,"103");//账套参数暂时无效，在数据库中已固定账套号
         Map<String,Integer> map1 = new HashMap<>();
 
         if(map.get("iFatherId") != null){//主表主键
@@ -113,6 +113,7 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
                 map.put("cVenCode",orderInfo.get("cVenCode"));//供货单位  委外订单供应商-根据订单号获取
                 map.put("cDepCode",orderInfo.get("cDepCode"));//部门-根据订单号获取
                 map.put("cPersonCode",orderInfo.get("cPersonCode"));//业务员-根据订单号获取
+                map.put("ipurorderid",orderInfo.get("id"));//采购订单主表标识
             }
 
             Map<String,String> vendorInfo = subcontractingOrderMapper.selectVendorByCode(orderInfo.get("cVenCode"));
@@ -133,6 +134,10 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
             }else{
                 throw new RuntimeException("获取入库单号失败");
             }
+            StringBuffer sb = new StringBuffer();
+            sb.append("||st01|");
+            sb.append(cCode);
+            map.put("cSysBarCode",sb.toString());
 
             //插入主表
             this.baseMapper.saveRdRecord01One(map);
@@ -184,6 +189,12 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
                     if(itemMap.get("num") == null){
                         throw new RuntimeException("num为空");
                     }
+                    StringBuffer sb1 = new StringBuffer();
+                    sb1.append("||st01|");
+                    sb1.append(cCode);
+                    sb1.append("|");
+                    sb1.append(rowId);
+                    itemMap.put("cbSysBarCode",sb1.toString());
                     subcontractingOrderMapper.saveRdrecords01One(itemMap);
                 }
             }else{
@@ -210,14 +221,33 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
         return map;
     }
 
+    /**
+     * pda根据子表二维码获取信息
+     * @param cbSysBarCode
+     * @return
+     */
+    @DS("multi-three")
+    public Map<String,Object> selectRdAllByBar(String cbSysBarCode) {
+        Map<String,Object> map = subcontractingOrderMapper.selectRdAllByBar(cbSysBarCode);
+
+        return map;
+    }
+
     /**
      * 审核入库单
-     * @param code
+     * @param cbSysBarCode
      * @return
      */
-    @DS("multi-one")
-    public int toExamine(String code,String cHandler){
-        return subcontractingOrderMapper.toExamine(code,cHandler);
+    @DS("multi-three")
+    public int toExamine(String id,String cbSysBarCode,String cHandler){
+        subcontractingOrderMapper.updateDef(cbSysBarCode);
+        int num = subcontractingOrderMapper.selectNum(id);
+        if(num == 0){
+            return subcontractingOrderMapper.toExamine(id,cHandler);
+        }else{
+            return 0;
+        }
+
     }
 
 //    public Integer getMaxId(String id, String tableName) {
@@ -230,5 +260,16 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
 //        return maxId;
 //    }
 
+    public static void main(String[] args) {
+        String cCode = "00000019";
+        int rowId = 1;
+
+        StringBuffer sb1 = new StringBuffer();
+        sb1.append("||st01|");
+        sb1.append(cCode);
+        sb1.append("|");
+        sb1.append(rowId);
+        System.out.println(sb1.toString());
+    }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/controller/ProductionScheduleController.java

@@ -0,0 +1,12 @@
+package org.jeecg.modules.productionScheduleReport.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 生产进度报表
+ */
+@RestController
+@RequestMapping("/productionScheduleReport/productionSchedule")
+public class ProductionScheduleController {
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/entity/ProductionSchedule.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.productionScheduleReport.entity;
+
+import lombok.Data;
+
+/**
+ * 生产进度报表
+ */
+@Data
+public class ProductionSchedule {
+
+    private String moId; //编号
+    private String cvcName; //染厂
+    private String cCode; //委外订单号
+    private String cInvCode; //存货编码
+    private String cInvName; //存货名称
+    private String cEnglishName; //存货名称(英文名称)
+    private String itemNumber; //款号
+    private String color;//颜色
+    private String colorNumber;//色号
+    private String gram;//要求克重
+    private String doorWidth;//要求门幅
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/mapper/ProductionScheduleMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.productionScheduleReport.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule;
+
+
+/**
+ * @Description: 生产进度报表
+ * @Author: jeecg-boot
+ * @Version: V1.0
+ */
+public interface ProductionScheduleMapper extends BaseMapper<ProductionSchedule> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/mapper/xml/ProductionScheduleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.productionScheduleReport.mapper.ProductionScheduleMapper">
+
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/service/ProductionScheduleService.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.productionScheduleReport.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule;
+
+
+public interface ProductionScheduleService extends IService<ProductionSchedule> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/service/impl/ProductionScheduleImpl.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.productionScheduleReport.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule;
+import org.jeecg.modules.productionScheduleReport.mapper.ProductionScheduleMapper;
+import org.jeecg.modules.productionScheduleReport.service.ProductionScheduleService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProductionScheduleImpl extends ServiceImpl<ProductionScheduleMapper, ProductionSchedule> implements ProductionScheduleService {
+
+
+}