问题修改

src/main/java/com/tld/mapper/QueryListMapper.java

@@ -58,7 +58,7 @@ public interface QueryListMapper {
 
     List<Notice> getOtherReceivingGoods(Notice notice);
 
-    void updateType(String wmsCode);
+    void updateType(@Param("wmsCode") String wmsCode, @Param("type") int type);
 
     List<AskGoods> getOtherShipments(AskGoods askGoods);
 }

src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -203,10 +203,10 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             AskGoods askGoods1 = askGoodsMapper.getAsknInfo(askGoods); //要货单数量
             int alreadyNum =  askGoodsMapper.getAskInfoNumVitrual(askGoods);//已扫描总数
             int inventoryAlready =  askGoodsMapper.getInventoryAlready(askGoods);//库存已扫描数量
-            int inventorySurplus = (Integer.parseInt(inventory.getAmount()) - Integer.parseInt(inventory.getAmountLock())) - inventoryAlready; //库存剩余数量
+            Double inventorySurplus = (Double.parseDouble(inventory.getAmount()) - Double.parseDouble(inventory.getAmountLock())) - inventoryAlready; //库存剩余数量
             Double surplusNum = Double.parseDouble(askGoods1.getNum()) - Double.parseDouble(askGoods1.getOutNum()) - alreadyNum; //剩余要扫描数量
 
-            if(surplusNum >= inventorySurplus){
+            if(Double.doubleToLongBits(surplusNum) >= Double.doubleToLongBits(inventorySurplus)){
                 askGoods.setNum(String.valueOf(inventorySurplus));
             } else {
                 askGoods.setNum(String.valueOf(surplusNum));
@@ -351,7 +351,6 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     askGoodsMapper.updateRemoval(map.get("removalCode").toString());
                 }
                 errorMapper.addError(error);
-                type = 1;
             }else {
                 JSONObject jsonObject = (JSONObject) JSONObject.parse(result.get("data").toString());
                 JSONObject jsonObject1 = (JSONObject) JSONObject.parse(jsonObject.get("result").toString());
@@ -365,7 +364,6 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     for(Map<String, Object> map : askGoodsMapper.plugOutRemoval(removalCode)){
                         askGoodsMapper.updateRemoval(map.get("removalCode").toString());
                     }
-                    type = 1;
                 }else {
                     List<JSONObject>  data1 = (List<JSONObject>) JSONObject.parse(jsonObject1.get("data").toString());
                     for (JSONObject map : data1) {
@@ -771,6 +769,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateBOLOutStock");
                 error.setDataVal(returnData.toJSONString()).setType("销售出库");
                 errorMapper.addError(error);
+                queryListMapper.updateType(removalCode, 1);
             }else {
                 JSONObject jsonObject = (JSONObject) JSONObject.parse(result.get("data").toString());
                 JSONObject jsonObject1 = (JSONObject) JSONObject.parse(jsonObject.get("result").toString());
@@ -780,6 +779,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateBOLOutStock");
                     error.setDataVal(returnData.toJSONString()).setType("销售出库");
                     errorMapper.addError(error);
+                    queryListMapper.updateType(removalCode, 1);
                 }else {
                     List<JSONObject>  data1 = (List<JSONObject>) JSONObject.parse(jsonObject1.get("data").toString());
                     for (JSONObject map : data1) {
@@ -1180,7 +1180,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
      * @return
      */
     public String codeGenerateCk(){
-        StringBuilder stringBuilder = new StringBuilder("CK");
+        StringBuilder stringBuilder = new StringBuilder("YHCK");
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
         stringBuilder.append(sdf.format(date));

src/main/java/com/tld/service/impl/DeliveryServiceImpl.java

@@ -291,7 +291,7 @@ public class DeliveryServiceImpl implements DeliveryService {
      * @return
      */
     public String codeGenerateCk(){
-        StringBuilder stringBuilder = new StringBuilder("CK");
+        StringBuilder stringBuilder = new StringBuilder("XSCK");
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
         stringBuilder.append(sdf.format(date));

src/main/java/com/tld/service/impl/InviteServiceImpl.java

@@ -118,10 +118,10 @@ public class InviteServiceImpl implements InviteService {
             AskGoods askGoods1 = inviteMapper.getAsknInfo(askGoods); //要货单数量
             int alreadyNum =  inviteMapper.getAskInfoNumVitrual(askGoods);//已扫描总数
             int inventoryAlready =  inviteMapper.getInventoryAlready(askGoods);//库存已扫描数量
-            int inventorySurplus = (Integer.parseInt(inventory.getAmount()) - Integer.parseInt(inventory.getAmountLock())) - inventoryAlready; //库存剩余数量
+            Double inventorySurplus = (Double.parseDouble(inventory.getAmount()) - Double.parseDouble(inventory.getAmountLock())) - inventoryAlready; //库存剩余数量
             Double surplusNum = Double.parseDouble(askGoods1.getNum()) - Double.parseDouble(askGoods1.getOutNum()) - alreadyNum; //剩余要扫描数量
 
-            if(surplusNum >= inventorySurplus){
+            if(Double.doubleToLongBits(surplusNum) >= Double.doubleToLongBits(inventorySurplus)){
                 askGoods.setNum(String.valueOf(inventorySurplus));
             } else {
                 askGoods.setNum(String.valueOf(surplusNum));

src/main/java/com/tld/service/impl/QueryListServiceImpl.java

@@ -613,25 +613,7 @@ public class QueryListServiceImpl implements QueryListService {
                                     }
                                 }
                             } else {
-                                if(errorVal.getType().equals("移库")) {
-                                    queryListMapper.updateType(map.get("WMSCode").toString());
-                                } else if(errorVal.getType().equals("销售出库")){
-                                    JSONObject json = (JSONObject) JSONObject.parse(errorVal.getDataVal());
-                                    List<JSONObject> data2 = (List<JSONObject>) json.get("BILLs");
-                                    for (JSONObject jsonObject2 : data2) {
-                                        if (jsonObject2.get("WMSCode").toString().equals(map.get("WMSCode")) && jsonObject2.get("WareHouse").toString().equals(map.get("WareHouse"))) {
-                                            //查询物料信息
-                                            MaterialClass material = warehousingMapper.getMaterial(new Notice().setMaterialId(jsonObject2.get("Material").toString()));
-                                            if(material.getPartType().equals("原材料")) {
-                                                askGoodsMapper.updateRemoval(jsonObject2.get("WMSCode").toString());
-                                            } else if(material.getPartType().equals("半成品")) {
-                                                askGoodsMapper.updateRemovalHalfProduct(jsonObject2.get("WMSCode").toString());
-                                            } else if(material.getPartType().equals("产成品")){
-                                                askGoodsMapper.updateRemovalHalf(jsonObject2.get("WMSCode").toString());
-                                            }
-                                        }
-                                    }
-                                }
+                                queryListMapper.updateType(map.get("WMSCode").toString(), 0);
                             }
                         }
                     }

src/main/java/com/tld/service/impl/WarehouseTransferServiceImpl.java

@@ -371,7 +371,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
      * @return
      */
     public String codeGenerateYK(){
-        StringBuilder stringBuilder = new StringBuilder("YK");
+        StringBuilder stringBuilder = new StringBuilder("YKCZ");
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
         stringBuilder.append(sdf.format(date));

src/main/java/com/tld/service/impl/WarehousingServiceImpl.java

@@ -973,7 +973,7 @@ public class WarehousingServiceImpl implements WarehousingService {
      * @return
      */
     public String codeGenerateRk() {
-        StringBuilder stringBuilder = new StringBuilder("RK");
+        StringBuilder stringBuilder = new StringBuilder("CLRK");
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
         stringBuilder.append(sdf.format(date));
@@ -990,7 +990,7 @@ public class WarehousingServiceImpl implements WarehousingService {
      * @return
      */
     public String codeGenerateCk() {
-        StringBuilder stringBuilder = new StringBuilder("CK");
+        StringBuilder stringBuilder = new StringBuilder("CPCK");
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
         stringBuilder.append(sdf.format(date));

src/main/resources/mapper/AskGoodsMapper.xml

@@ -119,7 +119,7 @@
           and a.account_sleeve = #{companyNumber}
           and a.hold = '0'
           and (c.warehouse_type = '0' or c.warehouse_type = '1' or c.warehouse_type = '2')
-        order by a.produc_date
+        order by a.produc_batch
     </select>
     <!-- 新增出库虚拟表 -->
     <insert id="addAskGoodsVitrual">
@@ -581,7 +581,7 @@
     </update>
     <!-- 查询指定pda 指定物料扫描总数 -->
     <select id="getScanNum" resultType="String">
-        select if(sum(num) is null, 0, num)
+        select if(sum(num) is null, 0, sum(num))
         from tld_ask_goods_vitrual
         where unique_code = #{uniqueCode}
           and ask_goods_id = #{askGoodsId}
@@ -930,6 +930,7 @@
         <if test="supplierId != '' and supplierId != null">
             and supplier_id = #{supplierId}
         </if>
+        order by produc_batch
     </select>
     <!-- 其他入库查询库存是否存在 -->
     <select id="getInventoryInfoOther" resultType="com.tld.model.Inventory">

src/main/resources/mapper/InviteMapper.xml

@@ -69,7 +69,8 @@
             b.company_number,
             c.name ,
             c.code,
-            c.id AS departmentId
+            c.id AS departmentId,
+            a.wbs
         FROM
             tld_invite a
             JOIN tld_invite_f b ON a.ask_goods_id = b.ask_goods_id
@@ -107,7 +108,7 @@
             b.storage_location_name as storageLocationName
         from tld_inventory a
         join tld_storage_location b on a.storage_location_code = b.storage_location_code
-        where a.material_id = #{materialId} and a.account_sleeve = #{companyNumber} and a.hold = '0' and b.warehouse_where != '5000' order by a.produc_date
+        where a.material_id = #{materialId} and a.account_sleeve = #{companyNumber} and a.hold = '0' and b.warehouse_where != '5000' order by a.produc_batch
     </select>
     <!-- 新增出库虚拟表 -->
     <insert id="addAskGoodsVitrual">

src/main/resources/mapper/QueryListMappeer.xml

@@ -977,12 +977,14 @@
             b.notification_type_name,
             c.name as materialName,
             c.code as materialCode,
+            c.part_type,
             k.name as companyName
         from tld_notices a
         join tld_notices_f b on a.notice_id = b.notice_id
         join tld_material c on a.material_id = c.tld_id
         join tld_company k on b.company_number = k.code
         <trim prefix="WHERE" prefixOverrides="and |or">
+            IFNULL(a.warehousing_num, 0) <![CDATA[<]]> (a.num + 0)
             <if test="materialCode != null and materialCode != ''">
                 and c.code like CONCAT(CONCAT('%', #{materialCode}), '%')
             </if>
@@ -1012,8 +1014,12 @@
     </select>
     <!-- 移库修改状态 -->
     <update id="updateType">
-        update tld_storage set transmission_type = 0 where storage_code = #{wmsCode};
-        update tld_removal set transmission_type = 0 where storage_code = #{wmsCode};
+        update tld_storage set transmission_type = #{type} where storage_code = #{wmsCode};
+        update tld_removal set transmission_type = #{type} where storage_code = #{wmsCode};
+        update tld_removal_half_product set transmission_type = #{type} where storage_code = #{wmsCode};
+        update tld_removal_half set transmission_type = #{type} where storage_code = #{wmsCode};
+        update tld_half set transmission_type = #{type} where storage_code = #{wmsCode};
+        update tld_half_product set transmission_type = #{type} where storage_code = #{wmsCode};
     </update>
     <!--查询其它出库信息-->
     <select id="getOtherShipments" resultType="com.tld.model.AskGoods">
@@ -1036,12 +1042,14 @@
             b.if_commodity,
             c.name as materialName,
             c.code as materialCode,
+            c.part_type,
             k.name as companyName
         from tld_enquiry a
         join tld_enquiry_f b on a.ask_goods_id = b.ask_goods_id
         join tld_material c on a.material_id = c.tld_id
         join tld_company k on b.company_number = k.code
         <trim prefix="WHERE" prefixOverrides="and |or">
+            IFNULL(a.out_num, 0) <![CDATA[<]]> (a.num + 0)
             <if test="materialCode != null and materialCode != ''">
                 and c.code like CONCAT(CONCAT('%', #{materialCode}), '%')
             </if>

src/main/resources/mapper/WarehouseTransferMapper.xml

@@ -195,7 +195,7 @@
         <if test="warehouseWhere != null and warehouseWhere != ''">
             and c.tld_id = #{warehouseWhere}
         </if>
-        order by a.produc_date
+        order by a.produc_batch
     </select>
     <!-- 查询是否存在虚拟库存 -->
     <select id="getInventoryVitrual" resultType="com.tld.model.Inventory">

src/main/resources/mapper/WarehousingMapper.xml

@@ -169,7 +169,7 @@
         values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.storageLocationCode},#{item.wllbClass},#{item.materialId},#{item.num},now(),'0','0',#{item.accountSleeve},#{item.wbs},#{item.suppId},#{item.serial},#{item.wllbCode},#{item.producDate},
-            now(),#{item.producDate},#{item.attribute})
+            now(),(curdate() + 0),#{item.attribute})
         </foreach>
     </insert>
     <!-- 删除临时表数据 -->
@@ -1046,7 +1046,7 @@
             b.company_number,
             b.source_type,
             b.move_type,
-            b.entry_number,
+            a.entry_number,
             a.id as wmsItemId,
             b.id as wmsId,
             a.wbs,