|
@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
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.syShippingOrder.entity.SyShippingOrderItem;
|
|
|
+import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderItemMapper;
|
|
|
+import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper;
|
|
|
import org.jeecg.modules.documents.syShippingOrder.service.ISyShippingOrderService;
|
|
|
import org.jeecg.modules.spapl.entity.SizeTable;
|
|
|
import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
|
|
@@ -47,8 +50,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
@Autowired
|
|
|
private SyPreAssembledPackingListMapper syPreAssembledPackingListMapper;//预装箱单主表
|
|
|
@Autowired
|
|
|
- private ISyShippingOrderService iSyShippingOrderService;//托书主表
|
|
|
-
|
|
|
+ private SyShippingOrderMapper syShippingOrderMapper;//托书主表
|
|
|
+ @Autowired
|
|
|
+ private SyShippingOrderItemMapper syShippingOrderItemMapper;//托书主表
|
|
|
|
|
|
BigDecimal add(List<SyPackingListTailoringItem> items,String pid){
|
|
|
BigDecimal box=new BigDecimal(0);//获取总箱数
|
|
@@ -129,6 +133,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
return box;
|
|
|
}
|
|
|
|
|
|
+ //获取流水号
|
|
|
String randomStr(){
|
|
|
SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
|
|
|
QueryWrapper<SyPackingListTailoring> queryWrapperCount=new QueryWrapper<>();
|
|
@@ -217,6 +222,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
@Override
|
|
|
public SyPackingListTailoring querySpaplId(String id) {
|
|
|
SyPackingListTailoring syPackingListTailoring=syPackingListTailoringMapper.querySpaplId(id);
|
|
|
+ if(syPackingListTailoring==null){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
//获得所有尺码组
|
|
|
List<SizeTable> sizes=syPreAssembledPackingListItemMapper.querySizes2(syPackingListTailoring.getSyPreAssembledPackingListId());
|
|
|
if(sizes.size()>0){
|
|
@@ -228,6 +236,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
for (SyPackingListTailoringItem item : items){
|
|
|
//循环子表获得尺码组
|
|
|
item.setSizeTables(sort(syPreAssembledPackingListItemMapper.querySize2(item.getGroupId(),item.getSyPreAssembledPackingListId())));
|
|
|
+ String planSize="";
|
|
|
+ for (SizeTable size:item.getSizeTables()){
|
|
|
+ planSize+=size.getSize()+":"+size.getQuantity()+"+";
|
|
|
+ }
|
|
|
+ item.setPlanSize(planSize.substring(0,planSize.length()-1));//截取最后一位+号
|
|
|
}
|
|
|
syPackingListTailoring.setSyPackingListTailoringItemList(items);
|
|
|
}
|
|
@@ -268,7 +281,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
|
|
|
//将装箱单修改的数据覆盖给托书
|
|
|
public SyShippingOrderItem typeConversion(SyPackingListTailoringItem item){
|
|
|
- SyShippingOrderItem syShippingOrderItem=new SyShippingOrderItem();
|
|
|
+ QueryWrapper queryWrapper=new QueryWrapper();//构造器
|
|
|
+ queryWrapper.eq("tailoring_fabric_item_id",item.getId());//根据子表id进行查询
|
|
|
+ SyShippingOrderItem syShippingOrderItem= syShippingOrderItemMapper.selectOne(queryWrapper);//获得对象
|
|
|
+ System.out.println("syShippingOrderItem的数据为\n"+syShippingOrderItem);
|
|
|
+ if(syShippingOrderItem==null){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
syShippingOrderItem.setBoxNumber(item.getBoxNumber());//箱数
|
|
|
syShippingOrderItem.setVolume(item.getTotalVolume());//体积
|
|
|
syShippingOrderItem.setNumber(item.getTotal());//数量
|
|
@@ -280,11 +299,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
syShippingOrderItem.setUnitPrice(item.getUnitPrice());//单价
|
|
|
syShippingOrderItem.setTailoringFabricItemId(item.getId());//子表id
|
|
|
syShippingOrderItem.setTailoringFabricId(item.getSyPackingListTailoringId());//主表id
|
|
|
- //syShippingOrderItem.getPreShipmentDate(item.getHod());
|
|
|
+ syShippingOrderItem.setPreShipmentDate(item.getHod());//发货日期
|
|
|
+ syShippingOrderItem.setPurchaseOutsourcingOrderNo(item.getSpurOrSubOrder());//采购/委外订单号
|
|
|
+ syShippingOrderItem.setReadyFabric("成衣");
|
|
|
+ syShippingOrderItemMapper.updateById(syShippingOrderItem);//修改
|
|
|
//syShippingOrderItem.setEnglishName();//英文名称
|
|
|
//syShippingOrderItem.setSalesman(item.getSize());//业务员
|
|
|
//syShippingOrderItem.setOperatingDepartment();//业务部门
|
|
|
- //syShippingOrderItem.setPurchaseOutsourcingOrderNo();//采购/委外订单号
|
|
|
//syShippingOrderItem.setOutsourcingFactoryForProcurement();//采购/委外工厂
|
|
|
//BeanUtils.copyProperties(syPackingListTailoringItem, syShippingOrderItem);
|
|
|
return syShippingOrderItem;
|