更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehouseBaseInfoController.java

@@ -82,7 +82,7 @@ public class WarehouseBaseInfoController {
     @GetMapping("/api/getSnapshot")
     public String getSnapshot(String param) {
         try{
-            String url = "https://bi.zhaoliangsz.com:9230/ccm-api/v1/pods/snapshot/"+param;
+            String url = "https://bi.zhaoliangsz.com:9230/ccm-api/v1/pods/snapshot/"+param+"?cached=false";
             HttpGet httpGet = new HttpGet(url);
 
             CloseableHttpClient httpClient = HttpClients.createDefault();

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

@@ -273,6 +273,16 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 仓库名称
      */
     private String warehouseName;
+    /**
+     * 仓库负责人
+     */
+    @TableField(exist = false)
+    private String person;
+    /**
+     * 仓库负责人电话
+     */
+    @TableField(exist = false)
+    private String personPhone;
     /**
      * 结算员
      */

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

@@ -540,6 +540,11 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      */
     @TableField(exist = false)
     private String printFlag;
+    /**
+     * 业务编号
+     */
+    @TableField(exist = false)
+    private String busNo;
 
     @Override
     protected Serializable pkVal() {

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

@@ -239,6 +239,14 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
 //                    paymentManagement1.setQualityInspectionPictureAddress(qualityInspectionManagement.getPictureAddress());
 //                    paymentManagement1.setQualityInspectionManagement(qualityInspectionManagement);
 //                }
+                WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                        .eq("comp_id", paymentManagement1.getCompId())
+                        .eq("warehouse_name", paymentManagement1.getWarehouseName()));
+                if (warehouseBaseInfo != null) {
+                    //仓库负责人,电话
+                    paymentManagement1.setPerson(warehouseBaseInfo.getPersonCharge());
+                    paymentManagement1.setPersonPhone(warehouseBaseInfo.getPersonPhone());
+                }
                 String taskId = "";
                 // 只有待审核状态才有taskId
                 if (StringUtils.isNotBlank(paymentManagement1.getWorkflowId())) {
@@ -282,6 +290,11 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                 .eq("comp_id",qualityInspectionManagement.getCompId())
                 .eq("warehouse_name",qualityInspectionManagement.getWarehouseName()));
+        if (warehouseBaseInfo!=null){
+            //仓库负责人,电话
+            paymentManagement.setPerson(warehouseBaseInfo.getPersonCharge());
+            paymentManagement.setPersonPhone(warehouseBaseInfo.getPersonPhone());
+        }
         qualityInspectionManagement.setCodeUrl(qrCodeUtil.generateQRCodeImage(qualityInspectionManagement.getCompId()+"&"+qualityInspectionManagement.getQualityNo()+"&"+warehouseBaseInfo.getId(),800,800,"",qualityInspectionManagement.getId()));
         //公司名
         if (commonCompany != null) {

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

@@ -101,24 +101,10 @@ public class WarehousePositionInfoServiceImpl extends ServiceImpl<WarehousePosit
         WarehousePositionInfo warehousePositionInfo1=new WarehousePositionInfo();
         warehousePositionInfo1.setBinNumber("全部仓位");
         warehousePositionInfoList.add(warehousePositionInfo1);
-        List<WarehousePositionInfo> warehousePositionInfoList1 = this.selectList(new EntityWrapper<WarehousePositionInfo>()
+        warehousePositionInfoList.addAll(this.selectList(new EntityWrapper<WarehousePositionInfo>()
                 .eq("base_id", baseId)
-                .like("bin_number","托盘")
-                .eq("delete_flag", "0"));
-        if (warehousePositionInfoList1.size()>0){
-            WarehousePositionInfo warehousePositionInfo2=new WarehousePositionInfo();
-            warehousePositionInfo2.setBinNumber("托盘");
-            warehousePositionInfoList.add(warehousePositionInfo2);
-        }
-        List<WarehousePositionInfo> warehousePositionInfoList2 = this.selectList(new EntityWrapper<WarehousePositionInfo>()
-                .eq("base_id", baseId)
-                .like("bin_number","合营")
-                .eq("delete_flag", "0"));
-        if (warehousePositionInfoList2.size()>0){
-            WarehousePositionInfo warehousePositionInfo2=new WarehousePositionInfo();
-            warehousePositionInfo2.setBinNumber("合营");
-            warehousePositionInfoList.add(warehousePositionInfo2);
-        }
+                .eq("delete_flag", "0")
+                .orderBy("binNumber")));
         return warehousePositionInfoList;
     }
 

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

@@ -116,12 +116,12 @@
         w.ship_number as shipNumber,
         w.ship_name as shipName,
         w.create_date as createDate,
-        d.water_content as waterContent,
-        d.bulk_density as bulkDensity,
-        d.jiaorenli as jiaorenli,
-        d.impurity as impurity,
-        d.mildew_grain as mildewGrain,
-        d.imperfect_grain as imperfectGrain,
+        q.water_content as waterContent,
+        q.bulk_density as bulkDensity,
+        q.jiaorenli as jiaorenli,
+        q.impurity as impurity,
+        q.mildew_grain as mildewGrain,
+        q.imperfect_grain as imperfectGrain,
         w.secretary_weigher as secretaryWeigher,
         w.skin_inspector as skinInspector,
         w.start_weight as startWeight,
@@ -149,10 +149,10 @@
         c.comp_imo as taxRegistrationNo,
         w.solid_grain_water as solidGrainWater,
         w.cost,
-        IFNULL(q.quality_inspector,d.quality_inspector) as qualityInspector,
-        IFNULL(q.re_inspector,q.quality_inspector) as reInspector
+        q.quality_inspector as qualityInspector,
+        IFNULL(q.re_inspector,q.quality_inspector) as reInspector,
+        q.quality_no as busNo
         FROM warehouse_in_out_info w
-        left join warehouse_in_out_detail d on w.id=d.info_id
         left join warehouse_base_info wbi on wbi.id = w.base_id
         left join common_company c on c.comp_id = wbi.comp_id and c.delete_flag = 0
         left join quality_inspection_management q on q.warehouse_in_out_id = w.id and q.comp_id = wbi.comp_id and q.delete_flag
@@ -208,7 +208,7 @@
             AND w.in_out_type = #{inOutType}
         </if>
         <if test="binNumber != null and binNumber != ''">
-            AND (lower(w.bin_number) like lower(CONCAT('%',#{binNumber},'%')))
+            AND w.bin_number = #{binNumber}
         </if>
         <if test="compId != null and compId != ''">
             AND wbi.comp_id = #{compId}
@@ -230,8 +230,7 @@
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}
         </if>
-        group by d.id
-        ORDER BY w.update_date DESC,q.quality_inspector desc
+        ORDER BY q.quality_no
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>