发运明细单行删除

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -1255,4 +1255,31 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 		 return result;
 	 }
+
+
+	 /**
+	  * 发运明细修改单行删除
+	  * @param syShippingDetails
+	  * @return
+	  */
+     @PostMapping(value = "/singleRowdelect")
+	 public Result<Integer> singleRowdelect(@RequestBody SyShippingDetails syShippingDetails,HttpServletResponse req){
+
+		 Result<Integer> result = new Result<Integer>();
+
+		 if(oConvertUtils.isEmpty(syShippingDetails.getId())){
+             result.setMessage("ID不能为空！");
+             result.setSuccess(false);
+             return result;
+		 }
+
+		 int i = syShippingDetailsService.singleRowdelect(syShippingDetails.getId());
+		 if(i>0){
+		 	result.setSuccess(true);
+		 	result.setMessage("删除成功！");
+		 	result.setResult(i);
+		 }
+
+	 	return result;
+	 }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/SyShippingDetailsItem.java

@@ -397,7 +397,14 @@ public class SyShippingDetailsItem {
 		this.orderRemainingQuantity = orderDataVo.getQuantity();
 		this.shipmentQuantity = orderDataVo.getQuantity();
 		this.salesTypeText = orderDataVo.getSalesTypeText();
-        this.customerAbbreviation = orderDataVo.getCustomerAbbreviation();
+
+		//客户简称字段用最终客户字段替代 只针对成衣
+		if(orderDataVo.getInventoryCcode().substring(0,2).equals("19")){
+			this.customerAbbreviation = orderDataVo.getEndCustomer();
+		}else{
+			this.customerAbbreviation = orderDataVo.getCustomerAbbreviation();
+		}
+
         this.customerName = orderDataVo.getCustomerName();
         this.exchangeRate = orderDataVo.getExchangeRate();
         this.salesDepartment = orderDataVo.getSalesDepartment();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/SyShippingDetailsMapper.java

@@ -59,4 +59,7 @@ public interface SyShippingDetailsMapper extends BaseMapper<SyShippingDetails> {
 
     //面辅料导出使用
     public List<SyShippingDetailsVo> excelItem(@Param("ew") QueryWrapper<SyShippingDetailsVo> queryWrapper);
+
+    //发运明细修改单行删除
+    public int singleRowdelect(@Param("id") String id);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -260,4 +260,12 @@ where a.del_flag = 0 and b.del_flag = 0 and b.inventory_ccode NOT LIKE '19%') t
 ${ew.customSqlSegment}
     </select>
 
+
+    <update id="singleRowdelect">
+
+        update sy_shipping_details_item
+            set del_flag = '1'
+            where id = #{id}
+
+    </update>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/ISyShippingDetailsService.java

@@ -60,5 +60,8 @@ public interface ISyShippingDetailsService extends IService<SyShippingDetails> {
     //批量提交/取消提交
     public int batchSubmission(List<String> submitListId,String type);
 
+    //发运明细修改单行删除、
+    public int singleRowdelect(String id);
+
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -404,4 +404,35 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
         return 0;
     }
 
+
+    /**
+     * 发运明细修改单行删除
+     * @param ids
+     * @return
+     */
+    @Override
+    public int singleRowdelect(String id) {
+
+        int i = 0;
+
+        //先回写销售订单剩余数量
+
+        SyShippingDetailsItem entity = syShippingDetailsItemService.getById(id);
+
+        if(oConvertUtils.isNotEmpty(entity)){
+            //回写销售订单剩余数量
+                SyOrderDataItem orderDataItem = syOrderDataItemService.getById(entity.getSyOrderDataItemId());
+                if (oConvertUtils.isNotEmpty(orderDataItem)) {
+                    BigDecimal suerBox = orderDataItem.getSurplusNum().add(entity.getShipmentQuantity());
+                    orderDataItem.setSurplusNum(suerBox);
+                    syOrderDataItemService.updateById(orderDataItem);
+                }
+                //删除子表
+                syShippingDetailsMapper.syshippingDetailsItemUpdate(entity.getId());
+                i = 1;
+        }
+
+        return i;
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -245,7 +245,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setCreateTime(sf.parse(createTime));
 
                         syShippingOrderItem.setGroupId(groupid);//分组ID
-                        syShippingOrderItem.setNumber(lit.getPiecesBox());//数量
+                        syShippingOrderItem.setNumber(lit.getTotal());//数量
                         syShippingOrderItem.setBoxNumber(lit.getBoxNumber());//箱数
                         syShippingOrderItem.setId(oConvertUtils.id());
                         syShippingOrderItem.setSyShippingOrderItemId(id);