bug修改

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java

@@ -54,7 +54,7 @@ public class CheckOrderUtils {
             filterUdiInfoRequest.setNameCode(myErpOrder.getNameCode());
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(myErpOrder.getBindRlFk());
             for (ErpOrderEntity vailOrderEntity : vailOrderEntities) {
-                if(!vailOrderEntity.isCheckSuccess()){
+                if (!vailOrderEntity.isCheckSuccess()) {
                     if (checkId(vailOrderEntity, udiRelevanceResponse, bussinessTypeEntity) == null
                             && checkBatchNo(vailOrderEntity, myErpOrder) == null
                             && checkProductDate(vailOrderEntity, myErpOrder) == null
@@ -129,7 +129,7 @@ public class CheckOrderUtils {
                     status = getStockOrderStatus(orderEntity, bussinessTypeEntity);
                     stockOrderEntity.setStatus(status);
                     stockOrderEntity.setOrderIdFk(orderId);
-                    if(orderEntity.getCustomerId().equals("110")){
+                    if (orderEntity.getCustomerId().equals("110")) {
                         stockOrderEntity.setReviewUser(orderEntity.getReviewUser());
                     }
                     stockOrderService.updateById(stockOrderEntity);
@@ -192,8 +192,7 @@ public class CheckOrderUtils {
                 if (bussinessTypeEntity.isSecCheckBalacne()) {
                     return ConstantStatus.SORDER_CHECKED;
                 }
-            }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
-            else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
                 if (bussinessTypeEntity.isSecCheckUdiwms()) {
                     return ConstantStatus.SORDER_CHECKED;
                 }
@@ -254,15 +253,15 @@ public class CheckOrderUtils {
                     if (vailOrderEntity.getGoodsid().equals(udiRelevanceResponse.getThirdId4() + ""))
                         return null;
                 }
-                return "产品ID不匹配！";
+                return vailOrderEntity.getCoName() + "产品ID不匹配！";
             }
 
 
         } else {
-            return "产品ID不匹配！";
+            return vailOrderEntity.getCoName() + "产品ID不匹配！";
         }
 
-        return "产品信息未找到！";
+        return vailOrderEntity.getCoName() + "产品信息未找到！";
     }
 
     public String checkBatchNo(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
@@ -274,7 +273,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "批次号不匹配！";
         }
-        return "批次号不匹配！";
+        return myErpOrder.getCoName() + "批次号不匹配！";
     }
 
     public String checkProductDate(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
@@ -286,7 +285,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "生产日期不匹配！";
         }
-        return "生产日期不匹配！";
+        return myErpOrder.getCoName() + "生产日期不匹配！";
     }
 
 
@@ -299,7 +298,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "失效日期不匹配！";
         }
-        return "失效日期不匹配！";
+        return myErpOrder.getCoName() + "失效日期不匹配！";
     }
 
 
@@ -312,7 +311,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "仓位号不匹配！";
         }
-        return "仓位号不匹配！";
+        return myErpOrder.getCoName() + "仓位号不匹配！";
     }
 
     public String checkCount(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {

api-admin/src/main/java/com/glxp/sale/admin/entity/receipt/ProductInfoEntity.java

@@ -52,10 +52,20 @@ public class ProductInfoEntity {
     private String expireDate;
 
     private Boolean isNewest;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     private String cplx;
     private String hchzsb;
 
+    private String sfwblztlcp;
+    private String cgzmraqxgxx;
+    private String sfbjwycxsy;
+    private String zdcfsycs;
+    private String sfwwjbz;
+    private String syqsfxyjxmj;
+    private String qtxxdwzlj;
+    private String mjfs;
+
+
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java

@@ -38,7 +38,8 @@ public class StockOrderFilterRequest extends ListPageRequest {
     private String entrustUser;
     private boolean entrustEnd;
     private String localAction;
-
+    private String startDate; //起始日期
+    private String endDate; //结束日期
 
     private String orderId;
 

api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncCompanyDlTask.java

@@ -36,7 +36,7 @@ public class AsyncCompanyDlTask implements SchedulingConfigurer {
                     ScheduledRequest scheduledRequest = new ScheduledRequest();
                     scheduledRequest.setCronName("syncCompany");
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
-                    String cron = scheduledEntity.getCron();//"0 55 5 * * ?";
+                    String cron = scheduledEntity.getCron();
                     if (cron.isEmpty()) {
                         logger.error("cron is null");
                     }

api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml

@@ -360,6 +360,7 @@
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
         ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
         ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
+,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
         )
         values
             (
@@ -403,7 +404,15 @@
         #{updateTime},
         #{hchzsb},
         #{cplx},
-        #{hchzsb}
+        #{hchzsb},
+        #{sfwblztlcp},
+        #{cgzmraqxgxx},
+        #{sfbjwycxsy},
+        #{zdcfsycs},
+        #{sfwwjbz},
+        #{syqsfxyjxmj},
+        #{qtxxdwzlj},
+        #{mjfs}
         )
     </insert>
 
@@ -417,6 +426,7 @@
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
         ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
         ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
+        ,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
         ) values
 
         <foreach collection="datas" item="item" index="index"
@@ -461,7 +471,8 @@
             #{item.cpms},
             #{item.cpbsbmtxmc},
             #{item.isNewest},
-            #{item.updateTime},#{item.cplx},#{item.hchzsb}
+            #{item.updateTime},#{item.cplx},#{item.hchzsb},#{item.sfwblztlcp},#{item.cgzmraqxgxx},#{item.sfbjwycxsy},#{item.zdcfsycs}
+            ,#{item.sfwwjbz},#{item.syqsfxyjxmj},#{item.qtxxdwzlj},#{item.mjfs}
             )
         </foreach>
     </insert>
@@ -511,6 +522,15 @@
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="cplx != null">cplx=#{cplx},</if>
             <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
+            <if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
+            <if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
+            <if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
+            <if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
+            <if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
+            <if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
+            </if>
+            <if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
+            <if test="mjfs != null">mjfs=#{mjfs},</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -530,7 +550,17 @@
             <if test="isNewest != null">isNewest=#{isNewest},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="cplx != null">cplx=#{cplx},</if>
-            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
+            <if test="hchzsb != null">hchzsb=#{hchzsb},
+            </if>
+            <if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
+            <if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
+            <if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
+            <if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
+            <if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
+            <if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
+            </if>
+            <if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
+            <if test="mjfs != null">mjfs=#{mjfs},</if>
         </set>
         WHERE uuid = #{uuid}
     </update>

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -193,6 +193,15 @@
             <if test="endTime!=null and endTime!=''">
                 <![CDATA[  and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d')    ]]>
             </if>
+
+            <if test="startDate!=null and startDate!=''">
+                <![CDATA[   and DATE_FORMAT(billdate, '%Y-%m-%d')>=  DATE_FORMAT(#{startDate}, '%Y-%m-%d')   ]]>
+            </if>
+            <if test="endDate!=null and endDate!=''">
+                <![CDATA[  and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d')    ]]>
+            </if>
+
+
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
@@ -303,7 +312,8 @@
         select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh
         spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count,
         basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
-        inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, basic_products.cpms,io_codes.nameCode,io_codes.relId
+        inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc,
+        basic_products.cpms,io_codes.nameCode,io_codes.relId
         from io_codes
         INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
         INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid