1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehousingOrder.java

@@ -166,6 +166,16 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      * 请款
      */
     private Double requestFunds;
+    /**
+     * 请款人
+     */
+    private String requestPerson;
+    /**
+     * 请款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date requestDate;
     /**
      * 客户
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -287,7 +287,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 warehousingOrder.setGoodsName(warehousingOrder1.getGoodsName());
                 warehousingOrder.setAvgCost(warehousingOrder1.getAvgCost());
                 warehousingOrder.setInType("收购入库");
-                double weight = paymentManagementList.stream().mapToDouble(PaymentManagement::getNetWeight).sum();
+                double weight = (paymentManagementList.stream().mapToDouble(PaymentManagement::getNetWeight).sum())/1000;
                 warehousingOrder.setInWarehouseWeight(Float.valueOf(String.valueOf(weight)));
                 warehousingOrder.setSurplusWeight(Float.valueOf(String.valueOf(weight)));
                 double money = paymentManagementList.stream().mapToDouble(PaymentManagement::getAmountIngPayable).sum();
@@ -610,6 +610,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                             for (WarehousingOrder warehousingOrder2 : warehousingOrderList) {
                                 warehousingOrder2.setStatusFlag(StatusEnum.PENDING_PAYMENT.getFlag());
                                 warehousingOrder2.setStatus(StatusEnum.PENDING_PAYMENT.getName());
+                                warehousingOrder2.setRequestPerson(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
+                                warehousingOrder2.setRequestDate(new Date());
                                 warehousingOrder2.setWorkflowId(workflowId);
                                 warehousingOrder2.setBatchId(batchId);
                                 this.updateById(warehousingOrder2);
@@ -624,6 +626,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                         for (WarehousingOrder warehousingOrder2 : warehousingOrderList) {
                             warehousingOrder2.setStatusFlag(StatusEnum.PENDING_PAYMENT.getFlag());
                             warehousingOrder2.setStatus(StatusEnum.PENDING_PAYMENT.getName());
+                            warehousingOrder2.setRequestPerson(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
+                            warehousingOrder2.setRequestDate(new Date());
 //                            warehousingOrder2.setWorkflowId(workflowId);
                             warehousingOrder2.setBatchId(batchId);
                             this.updateById(warehousingOrder2);
@@ -927,6 +931,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         Map<String, Object> pageView = new HashMap<>();
         pageView.put("businessKeys", businessKeys);
         pageView.put("batchId", warehousingOrder.getBatchId());
+        pageView.put("appFlag", "1");
         // 查询入库单总数
         List<WarehousingOrder> dataList = baseMapper.getListByCondition(pageView);
 
@@ -1201,6 +1206,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         Map<String, Object> pageView = new HashMap<>();
         pageView.put("businessKeys", businessKeys);
         pageView.put("batchId", warehousingOrder.getBatchId());
+        pageView.put("appFlag", "1");
         // 查询入库单总数
         List<WarehousingOrder> dataList = baseMapper.getListByCondition(pageView);
 
@@ -1221,6 +1227,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         if (dataList.size()>0) {
             warehousingOrder1.setWarehouseName(dataList.get(0).getWarehouseName());
             warehousingOrder1.setIssuingTime(dataList.get(0).getIssuingTime());
+            warehousingOrder1.setRequestPerson(dataList.get(0).getRequestPerson());
+            warehousingOrder1.setRequestDate(dataList.get(0).getRequestDate());
+            warehousingOrder1.setWarehousingOrderList(dataList);
             String taskId = "";
             // 只有待审核状态才有taskId
             if (StringUtils.isNotBlank(dataList.get(0).getWorkflowId())) {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -58,6 +58,8 @@
         w.warehouse_name as warehouseName,
         wbi.warehouse_type as warehouseType,
         w.request_funds as requestFunds,
+        w.request_person as requestPerson,
+        w.request_date as requestDate,
         w.in_warehouse_weight as inWarehouseWeight,
         w.customer,
         w.remark,
@@ -104,7 +106,9 @@
             </foreach>
             )
         </if>
+        <if test="appFlag == null">
         group BY w.base_id,DATE_FORMAT(w.issuing_time,"%Y%m%d")
+        </if>
         ORDER BY w.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}