问题修改

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

@@ -81,7 +81,7 @@ public interface WarehousingMapper {
 
     AskGoods getAskGoodsHalf(Notice notice);
 
-    void updateAskGoodsHalf(@Param("id")String id, @Param("warehousingNum")String warehousingNum);
+    void updateAskGoodsHalf(@Param("id")String id, @Param("warehousingNum")String warehousingNum, @Param("type")String type);
 
     void addRemovalHalfProduct(AskGoods askGoods1);
 

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

@@ -168,7 +168,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         lock.lock();
         try{
             Map<String, Object> mapVal = askGoodsMapper.getScanIsNot(askGoods);
-            if((Double.parseDouble(mapVal.get("inventoryNum").toString()) - Double.parseDouble(mapVal.get("virtualNum").toString())) == 0){
+            if(Double.doubleToLongBits(Double.parseDouble(mapVal.get("inventoryNum").toString()) - Double.parseDouble(mapVal.get("virtualNum").toString())) == 0){
                 map.put("msg", "500");
                 map.put("errMsg", "已全部出库");
                 return map;

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

@@ -71,7 +71,7 @@ public class DeliveryServiceImpl implements DeliveryService {
                 for(Inventory inventory : deliveryMapper.getInventory(storageLocationCode, delivery)){
                     int occupy = deliveryMapper.getVitrual(inventory);
                     if(occupy == 0){
-                        if(Double.parseDouble(inventory.getAmount()) == Double.parseDouble(delivery.getOutNum())){
+                        if(Double.doubleToLongBits(Double.parseDouble(inventory.getAmount())) == Double.doubleToLongBits(Double.parseDouble(delivery.getOutNum()))){
                             list.add(inventory);
                             map.put("data", list);
                             map.put("msg", "200");

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

@@ -274,7 +274,7 @@ public class InviteServiceImpl implements InviteService {
         try{
             String userId = request.getHeader("userId");
             Map<String, Object> mapVal = inviteMapper.getDelAskGoods(id);
-            if(Double.parseDouble(mapVal.get("out_num").toString()) > 0){
+            if(Double.doubleToLongBits(Double.parseDouble(mapVal.get("out_num").toString())) > 0){
                 map.put("msg", "500");
                 map.put("errMsg", "此单据已出库！");
                 return map;

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

@@ -436,7 +436,7 @@ public class WarehousingServiceImpl implements WarehousingService {
                 map.put("errMsg", "订单已出库");
                 return map;
             }
-            if (Double.parseDouble(askGoods.getNum()) < Double.parseDouble(notice.getWarehousingNum())) {
+            if (Double.doubleToLongBits(Double.parseDouble(askGoods.getNum())) < Double.doubleToLongBits(Double.parseDouble(notice.getWarehousingNum()))) {
                 map.put("msg", "500");
                 map.put("errMsg", "出库数量大于要货单数量");
                 return map;
@@ -446,17 +446,23 @@ public class WarehousingServiceImpl implements WarehousingService {
                 map.put("errMsg", "没有查询到此半成品物料的库存");
                 return map;
             }
-            if (Double.parseDouble(notice.getWarehousingNum()) > Double.parseDouble(inventory.getAmount())) {
+            if (Double.doubleToLongBits(Double.parseDouble(notice.getWarehousingNum())) > Double.doubleToLongBits(Double.parseDouble(inventory.getAmount()))) {
                 map.put("msg", "500");
                 map.put("errMsg", "库存不足");
                 return map;
             }
-            if (Double.parseDouble(notice.getWarehousingNum()) == Double.parseDouble(inventory.getAmount())) {
+            if (Double.doubleToLongBits(Double.parseDouble(notice.getWarehousingNum())) == Double.doubleToLongBits(Double.parseDouble(inventory.getAmount()))) {
                 warehousingMapper.delInventoryNotice(notice);
             } else {
                 warehousingMapper.updateInventoryNoticeNum(notice);
             }
-            warehousingMapper.updateAskGoodsHalf(askGoods.getId(), notice.getWarehousingNum());//修改要货单出库数量
+            //出库数量 + 已经出库的数量 如果相等 则改变单据状态
+            Double num = Double.parseDouble(notice.getWarehousingNum()) + Double.parseDouble(askGoods.getOutNum());
+            String type = null;
+            if(Double.doubleToLongBits(Double.parseDouble(askGoods.getNum())) == Double.doubleToLongBits(num)){
+                type = "1";
+            }
+            warehousingMapper.updateAskGoodsHalf(askGoods.getId(), notice.getWarehousingNum(), type);//修改要货单出库数量
             //新增返回gs信息
             String removalCode = codeGenerateCk();
             //新增半成品出库流水

src/main/resources/application.yml

@@ -41,7 +41,8 @@ spring:
     async:
       request-timeout: 20000
   redis:
-    host: 8.142.144.205
+#    host: 8.142.144.205
+    host: 10.2.111.91
     port: 6379
     password: '#09SilverB'
     jedis:

src/main/resources/mapper/PdaVersionMapper.xml

@@ -4,6 +4,10 @@
 <mapper namespace="com.tld.mapper.PdaVersionMapper">
     <!-- 查询pda版本号 -->
     <select id="getPdaVersion" resultType="java.util.Map">
-        select *,SYSDATE() as today from tld_pda_version limit 1
+        SELECT
+            ifnull( max( version_number ), 0 ) AS versionNumber,
+            SYSDATE() AS today
+        FROM tld_pda_version
+        LIMIT 1
     </select>
 </mapper>

src/main/resources/mapper/WarehousingMapper.xml

@@ -702,8 +702,10 @@
     <!-- 修改要货单出库数量 -->
     <update id="updateAskGoodsHalf">
         update tld_ask_goods
-        set out_num = ifnull(out_num, 0) + #{warehousingNum},
-            type = '1'
+        set out_num = ifnull(out_num, 0) + #{warehousingNum}
+        <if test="type != null and type != ''">
+            ,type = '1'
+        </if>
         where id = #{id}
     </update>
     <!-- 新增半成品流水 -->