装箱单修改日期格式

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -61,7 +61,6 @@
 			IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
 			/*a.declaration_Name,报关品名*/
 			c.master_Metering,/*主计量*/
-			/*c.Weight as gramWeight,克重*/
 			b.salesman,/*业务员*/
 			b.item_Number,/*款号*/
 			b.colour,/*颜色*/
@@ -71,9 +70,10 @@
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
 			b.material_Composition AS Composition,/*成分/Composition*/
-			/*b.guangpei_Gate_Width AS Width,门幅/Width*/
+			b.guangpei_Gate_Width AS Width,/*门幅/Width*/
-			'120cm' AS Width,/*门幅/Width*/
+			c.Weight as gramWeight,/*克重*/
-			'280克' as gramWeight,/*克重*/
+			/*'120cm' AS Width,门幅/Width
+			'280克' as gramWeight,克重*/
 			b.sales_Unit_Price AS price,/*价格*/
 			b.treatment_Method,/*处理方式*/
 			b.manual_Yarn_Flag,/*是否手册纱*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -55,8 +56,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		syPackingListFabric.setDocumentNo(dateNo);//单据号
 		syPackingListFabricMapper.insert(syPackingListFabric);
 		Map<String,String> mapId=new HashMap<String, String>();//key为发运明细子表id，value为分组id
+		BigDecimal total=new BigDecimal("0");//合计数量，初始为0
 		for(SyPackingListFabricItem entity:syPackingListFabric.getSyPackingListFabricItem()) {
 			entity.setRemainingQuantity(entity.getInventoryQuantity());//入库数量
+			total=total.add(entity.getInventoryQuantity());//循环添加每条数据的入库数量
 			String key=entity.getSyShippingDetailsItemId();//获取发运明细子表id
 			if(!mapId.containsKey(key)){//如果这个发运明细id没有分组id,就生成一个新的分组id
 				mapId.put(key,oConvertUtils.getId());
@@ -74,6 +77,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			syShippingDetailsItemMapper.updateById(detailsItem);
 			syPackingListFabricItemMapper.insert(entity);
 		}
+		syPackingListFabric.setQuantity(total);//给数量附上初始值
+		syPackingListFabric.setRemainingQuantity(total);//给剩余数量附上初始值
+		syPackingListFabricMapper.updateById(syPackingListFabric);//重新修改数据
 		return syPackingListFabric;
 	}
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoringItem.java

@@ -54,6 +54,8 @@ public class SyPackingListTailoringItem implements Serializable {
 	/**HOD*/
     @Excel(name = "HOD", width = 15)
 	@ApiModelProperty(value = "HOD")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date hod;
 	/**STYLE NO*/
     @Excel(name = "STYLE NO", width = 15)

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
+import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
+import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem;
 import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderItemMapper;
 import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper;
@@ -128,6 +130,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					continue;
 				}
 				syPackingListTailoringItemMapper.updateById(item1);
+				typeConversion(item1);//调用方法同步修改托书数据
+
 			}
 		}
 		return box;
@@ -208,14 +212,34 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	public void delMain(String id) {
 		syPackingListTailoringItemMapper.deleteByMainId(id);
 		syPackingListTailoringMapper.deleteByMainId(id);
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.eq("tailoring_Fabric_Id",id);//条件
+		SyShippingOrderItem syShippingOrderItem=syShippingOrderItemMapper.selectOne(queryWrapper);
+		if(syShippingOrderItem==null){//判断托书是否已经参照
+			return;
+		}
+		//根据成衣装箱单主表id修改为
+		UpdateWrapper updateWrapper=new UpdateWrapper<>();
+		updateWrapper.eq("tailoring_Fabric_Id",id);//条件
+		updateWrapper.set("del_flag","1");//修改为已删除
+		syShippingOrderItemMapper.update(null,updateWrapper);//修改
+		queryWrapper=new QueryWrapper();
+		queryWrapper.eq("del_flag","0");
+		queryWrapper.eq("sy_Shipping_Order_Item_Id",syShippingOrderItem.getSyShippingOrderItemId());//获取主表id
+		List<SyShippingOrderItem> items=syShippingOrderItemMapper.selectList(queryWrapper);//获取数据
+		if(items.size()<1){//小于1就是数据都已被删除
+			updateWrapper =new UpdateWrapper<>();
+			updateWrapper.eq("id",syShippingOrderItem.getSyShippingOrderItemId());//条件
+			updateWrapper.set("del_flag","1");//修改为已删除
+			syShippingOrderMapper.update(null,updateWrapper);
+		}
 	}
 
 	@Override
 	@Transactional
 	public void delBatchMain(Collection<? extends Serializable> idList) {
 		for(Serializable id:idList) {
-			syPackingListTailoringItemMapper.deleteByMainId(id.toString());
+			delMain(id.toString());//调用删除方法
-			syPackingListTailoringMapper.deleteByMainId(id.toString());
 		}
 	}
 
@@ -291,8 +315,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		syShippingOrderItem.setBoxNumber(item.getBoxNumber());//箱数
 		syShippingOrderItem.setVolume(item.getTotalVolume());//体积
 		syShippingOrderItem.setNumber(item.getTotal());//数量
-		syShippingOrderItem.setGrossWeight(item.getGrossWeight());//毛重
+		syShippingOrderItem.setGrossWeight(item.getTotalGrossWeight());//总毛重
-		syShippingOrderItem.setNetWeight(item.getNetWeight());//净重
+		syShippingOrderItem.setNetWeight(item.getTotalNetWeight());//总净重
 		syShippingOrderItem.setSmailPo(item.getSmallPo());//小PO号
 		syShippingOrderItem.setStyleNumber(item.getStyleNo());//款号
 		syShippingOrderItem.setDistributionPoint(item.getDistributionPoint());//分销点
@@ -304,7 +328,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		syShippingOrderItem.setReadyFabric("成衣");
 		syShippingOrderItemMapper.updateById(syShippingOrderItem);//修改
 		//syShippingOrderItem.setEnglishName();//英文名称
-		//syShippingOrderItem.setSalesman(item.getSize());//业务员
+		//syShippingOrderItem.setSalesman();//业务员
 		//syShippingOrderItem.setOperatingDepartment();//业务部门
 		//syShippingOrderItem.setOutsourcingFactoryForProcurement();//采购/委外工厂
 		//BeanUtils.copyProperties(syPackingListTailoringItem, syShippingOrderItem);