面料和预装箱单修改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -10,6 +10,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -268,4 +270,20 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	//订单号
 	@ApiModelProperty(value = "订单号")
 	private String orderNumber;
+	//剩余数量
+	@ApiModelProperty(value = "剩余数量")
+	private java.math.BigDecimal remainingQuantity;//剩余数量为0就会变成超发数量
+	/**超发数量*/
+	@Excel(name = "超发数量", width = 15)
+	@TableField(exist = false)
+	@ApiModelProperty(value = "超发数量")
+	private BigDecimal excessQuantity;//剩余数量
+	/**业务员*/
+	//@Excel(name = "业务员", width = 15)
+	@ApiModelProperty(value = "业务员")
+	private java.lang.String salesman;
+	/**业务部门(销售部门)*/
+	//@Excel(name = "业务部门(销售部门)", width = 15)
+	@ApiModelProperty(value = "业务部门(销售部门)")
+	private java.lang.String salesDepartment;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -74,6 +74,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				SyPreAssembledPackingListItem item1=item;
 				BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码件数
 				item1.setTotal(boxNumber);//该尺码件数
+				item1.setRemainingQuantity(boxNumber);//该尺码的剩余数量
 				item1.setSize(size.getSize());//获取尺码
 				item1.setActualPackingQty(size.getQuantity());//获取该尺码计划装箱数量
 				item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
@@ -95,6 +96,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				item1.setOmpoIdItem(syItem.getOmpoIdItem());//获取委外/采购订单子表Id
 				item1.setOrderNumber(syItem.getOrderNumber());//获取订单号
 				item1.setSyOrderDataItemId(syItem.getSyOrderDataItemId());//获取到订单子表id
+				item1.setSalesman(syItem.getSalesman());//获取业务员
+				item1.setSalesDepartment(syItem.getSalesDepartment());//获取销售部门
 				syPreAssembledPackingListItemMapper.insert(item1);//添加子表数据
 				//原剩余数量-预装箱单装箱数量=新剩余数量
 				syItem.setSurplusQuantity(syItem.getSurplusQuantity().subtract(item1.getTotal()));
@@ -121,6 +124,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码件数
 				item1.setSize(size.getSize());//获取尺码信息
 				item1.setTotal(boxNumber);//该尺码件数
+				item1.setRemainingQuantity(boxNumber);//该尺码的剩余数量
 				item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
 				//item1.setBoxNumber(boxNumber);//获取箱数
 				boxNumber=boxNumber.divide(item.getPiecesBox(),6,BigDecimal.ROUND_HALF_UP);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -333,21 +333,6 @@ public class SyPackingListFabricController {
 		result.setResult(syPackingListFabric);
 		return result;
 	}
-	
-/*	*//**
-	 * 通过id查询
-     *
-	 * @param id
-	 * @return
-	 *//*
-	@AutoLog(value = "装箱单面料-通过主表ID查询")
-	@ApiOperation(value="装箱单面料-通过主表ID查询", notes="装箱单面料-通过主表ID查询")
-	@GetMapping(value = "/querySyPackingListFabricItemByMainId")
-	public Result<?> querySyPackingListFabricItemListByMainId(@RequestParam(name="id",required=true) String id) {
-		List<SyPackingListFabricItem> syPackingListFabricItemList = syPackingListFabricItemService.selectByMainId(id);
-		return Result.OK(syPackingListFabricItemList);
-	}*/
-
 
   /**
    * 导出excel

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.splfi.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
@@ -25,5 +26,6 @@ public interface SyPackingListFabricItemMapper extends BaseMapper<SyPackingListF
 	public List<SyPackingListFabricItem> getSyShippingDetailsData(String id);
 
 	//根据id获取发运明细数据
+	@InterceptorIgnore(tenantLine = "true")
 	public List<SyPackingListFabricItem> getSyShippingDetailsDatas(@Param("ids") String[] ids,@Param("groupIds") String[] groupIds);
 }

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

@@ -57,23 +57,17 @@
 			a.id syShippingDetailsId,
 			b.id syShippingDetailsItemId,
 			(select declaration_Name from sy_declaration_elements where id=b.elements_Id) as declaration_Name,
-			/*IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,*/
 			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,/*主计量*/
 			b.salesman,/*业务员*/
 			b.item_Number,/*款号*/
 			b.colour,/*颜色*/
-
-			/*b.elements_Id,申报要素*/
 			b.u8_Remarks memo,/*备注*/
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
 			b.material_Composition AS Composition,/*成分/Composition*/
-			b.guangpei_Gate_Width AS Width,/*门幅/Width*/
-			c.Weight as gramWeight,/*克重*/
-			/*'120cm' AS Width,门幅/Width
-			'280克' as gramWeight,克重*/
+			if(INSTR(c.Weight,'克')>0,left(c.Weight,char_length(c.Weight)-1),0) gramWeight,
+			(if(ifnull(b.guangpei_Gate_Width,'x') REGEXP '[^0-9.]'>0,'0',b.guangpei_Gate_Width)) as Width,
 			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

@@ -146,6 +146,7 @@ return null;
 		String time= new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis());
 		SyPackingListFabric syPackingListFabric=syPackingListFabricMapper.getSyShippingDetailsData(ids);
 		syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(time));//获取制单日期
+		System.out.println("ids的数据为:\t"+ids[0]+"\ngroupIds为:\t"+groupIds[0]);
 		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids,groupIds));
 		return syPackingListFabric;
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -133,6 +133,8 @@ public class SyPackingListTailoringController {
 																	  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 																	  String stratDate,
 																	  String endDate,
+																	  @RequestParam(name="isReference", defaultValue="n")  String isReference,
+																	  @RequestParam(name="status", defaultValue="y") String status,
 																	  HttpServletRequest req) {
 		 //System.out.println("当前登录用户:"+((LoginUser)SecurityUtils.getSubject().getPrincipal()).getRealname());
 		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
@@ -167,6 +169,21 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(endDate)){//结束
 			 queryWrapper.le("b.hod",endDate);
 		 }
+		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
+			 if(status.equals("n")){
+				 queryWrapper.le("b.remaining_Quantity",0);//小于等于0--超发
+			 }else{
+				 queryWrapper.gt("b.remaining_Quantity",0);//大于0--正常
+			 }
+		 }
+		 if(oConvertUtils.isNotEmpty(isReference)){//是否已经被成衣装箱单参照
+			 if(status.equals("n")){
+				 queryWrapper.eq("a.is_Reference","1");//未被成衣装箱单参照
+			 }else{
+				 queryWrapper.eq("a.is_Reference","2");//已被成衣装箱单参照
+			 }
+		 }
+
 		 Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);
 		 IPage<SyPreAssembledPackingListVo> pageList = syPreAssembledPackingListService.selectPage(page, queryWrapper);
 		 return Result.OK(pageList);

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

@@ -85,6 +85,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				item1.setSyPreAssembledPackingListItemId(size.getItemId());//获取到预装箱单子表id
 				item1.setSort(size.getNum());//获取序号
 				item1.setId(oConvertUtils.id());//获取到随机id
+				SyPreAssembledPackingListItem syPreItem=syPreAssembledPackingListItemMapper.selectById(item.getSyPreAssembledPackingListItemId());//获取预装箱单数据
+				syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()));//新剩余数量=原剩余数量-装箱单新增数量
+				syPreAssembledPackingListItemMapper.updateById(syPreItem);//修改剩余数量
 				syPackingListTailoringItemMapper.insert(item1);//添加子表数据
 			}
 		}