问题修改

src/main/java/com/tld/controller/DeliveryController.java

@@ -80,4 +80,5 @@ public class DeliveryController {
     public Map<String, Object> delDelivery(String id , HttpServletRequest request){
         return deliveryService.delDelivery(id,request);
     }
+
 }

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

@@ -47,4 +47,6 @@ public interface DeliveryMapper {
     int getDeliveryScan(AskGoods askGoods);
 
     int getScanSum(Delivery delivery1);
+
+    void addRemovalHalfProduct(Delivery delivery1);
 }

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

@@ -140,7 +140,7 @@ public class DeliveryServiceImpl implements DeliveryService {
                 askGoods.setCompanyNumber(askGoods.getAccountSleeve());
                 Inventory inventory = deliveryMapper.getInventoryHalf(askGoods);
                 //如果出库库存等于虚拟表库存则删除此库存
-                if(Integer.parseInt(askGoods.getNum()) == Integer.parseInt(inventory.getAmount())){
+                if(Double.doubleToLongBits(Double.parseDouble(askGoods.getNum())) == Double.doubleToLongBits(Double.parseDouble(inventory.getAmount()))){
                     askGoodsMapper.deleteInventory(inventory);
                 } else {
                     inventory.setAmount(askGoods.getNum());
@@ -167,6 +167,18 @@ public class DeliveryServiceImpl implements DeliveryService {
                 } else if(materialClass.getPartType().equals("原材料")){
                     askGoods.setType("销售出库");
                     askGoodsMapper.addRemoval(askGoods);//插入出库流水
+                } else if(materialClass.getPartType().equals("半成品")){
+                    //半成品销售流水
+                    Delivery delivery1 = new Delivery()
+                            .setMaterialCode(askGoods.getWllbCode()) //物料code
+                            .setOutNum(askGoods.getNum()) //出库数量
+                            .setUserId(askGoods.getUserId()) //用户id
+                            .setDeliveryId(deliveryId) //销售单id
+                            .setCompanyNumber(list.get(0).getCompanyNumber()) //公司编号
+                            .setCustomerCode(list.get(0).getCustomerCode())//客户编号
+                            .setStorageCode(removalCode) //出库流水
+                            .setWbs(list.get(0).getWbs());// wbs
+                    deliveryMapper.addRemovalHalfProduct(delivery1); //流水录入
                 }
                 askGoodsMapper.deleteVirtual(askGoods.getId());//删除已出虚拟表库存
                 ReturRemoval returRemoval = new ReturRemoval()

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

@@ -464,7 +464,8 @@ public class WarehousingServiceImpl implements WarehousingService {
                     .setAskGoodsId(askGoods.getAskGoodsId())
                     .setDepartment(askGoods.getDepartment())
                     .setStorageCode(removalCode)
-                    .setWbs(notice.getWbs());//新增出库流水
+                    .setWbs(notice.getWbs())
+                    .setCompanyNumber(notice.getCompanyNumber());//新增出库流水
             warehousingMapper.addRemovalHalfProduct(askGoods1);
             ReturRemoval returRemoval = new ReturRemoval()
                     .setMaterialId(notice.getMaterialId())

src/main/resources/mapper/AskGoodsMapper.xml

@@ -523,7 +523,10 @@
                storage_location_code,
                num,
                user_id,
-               department
+               department,
+               account_sleeve,
+               wbs,
+               attribute
         from tld_ask_goods_vitrual
         where unique_code = #{uniqueCode}
           and type = #{type}

src/main/resources/mapper/DeliveryMapper.xml

@@ -16,6 +16,7 @@
             a.out_num,
             b.company_number,
             b.bills_time,
+            b.customer_code,
             b.delivery_type,
             b.source_type,
             b.move_type,
@@ -55,7 +56,8 @@
             a.scrq,
             a.produc_batch,
             a.attribute,
-            b.storage_location_name as storageLocationName
+            b.storage_location_name as storageLocationName,
+            a.account_sleeve
         FROM tld_inventory a
         LEFT JOIN tld_storage_location b on a.storage_location_code = b.storage_location_code
         WHERE #{storageLocationCode} LIKE CONCAT( '%', CONCAT( a.storage_location_code, ',' ), '%' )
@@ -67,7 +69,7 @@
             a.produc_batch
     </select>
     <!-- 查询指定库存内容 -->
-    <select id="getInventoryHalf" resultType="com.tld.model.AskGoods">
+    <select id="getInventoryHalf" resultType="com.tld.model.Inventory">
         SELECT
             a.id,
             a.storage_location_code,
@@ -82,8 +84,7 @@
             a.produc_date,
             a.scrq,
             a.produc_batch,
-            a.attribute,
-            b.storage_location_name as storageLocationName
+            a.attribute
         FROM tld_inventory a
         JOIN tld_material b on a.material_id = b.tld_id
         WHERE b.code = #{wllbCode} and a.account_sleeve = #{companyNumber} and a.wbs = #{wbs}
@@ -107,7 +108,7 @@
     </select>
     <!-- 修改销售单出库数量 -->
     <update id="updateDelivery">
-        update tld_delivery set ifnull(out_num, 0) = #{num} where delivery_id = #{deliveryId} and material_id = #{materialId}
+        update tld_delivery set out_num = (out_num + 0) + #{num} where delivery_id = #{deliveryId} and material_id = #{materialId}
     </update>
     <!-- 产成品出库流水 -->
     <insert id="addRemovalHalf">
@@ -239,4 +240,9 @@
         WHERE
             a.ask_goods_id = #{deliveryId} and b.tld_id = #{materialId}
     </select>
+    <!-- 新增半成品流水 -->
+    <insert id="addRemovalHalfProduct">
+        insert into tld_removal_half_product(wllb_code,num,user_id,scrq,ask_goods_id,storage_code,wbs,company_number)
+            value(#{materialCode},#{outNum},#{userId},now(),#{deliveryId},#{storageCode},#{wbs},#{companyNumber})
+    </insert>
 </mapper>

src/main/resources/mapper/WarehousingMapper.xml

@@ -683,8 +683,8 @@
     </update>
     <!-- 新增半成品流水 -->
     <insert id="addRemovalHalfProduct">
-        insert into tld_removal_half_product(wllb_code, num, user_id, scrq, ask_goods_id, department, storage_code, wbs)
-            value (#{wllbCode},#{num},#{userId},now(),#{askGoodsId},#{department},#{storageCode},#{wbs})
+        insert into tld_removal_half_product(wllb_code, num, user_id, scrq, ask_goods_id, department, storage_code, wbs, company_number)
+            value (#{wllbCode},#{num},#{userId},now(),#{askGoodsId},#{department},#{storageCode},#{wbs},#{companyNumber})
     </insert>
     <!-- 查询指定物料内容 -->
     <select id="getMaterial" resultType="com.tld.model.MaterialClass">