装箱单-面料增加提交功能

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

@@ -173,6 +173,66 @@ public class SyPackingListFabricController {
 		result.setResult(syPackingListFabric);
 		return result;
 	}
+
+	 /**
+	  * 提交
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "装箱单面料-提交")
+	 @ApiOperation(value="装箱单面料-提交", notes="装箱单面料-提交")
+	 @PostMapping(value = "/submit")
+	 public Result<SyPackingListFabric> submit(String id) {
+		 Result<SyPackingListFabric> result=new Result<>();
+		 if(oConvertUtils.isEmpty(id)){
+			 result.setSuccess(false);
+			 result.setMessage("id为空");
+			 return result;
+		 }
+		 SyPackingListFabric syPackingListFabric=syPackingListFabricService.getById(id);
+		 if (syPackingListFabric==null){
+			 result.setSuccess(false);
+			 result.setMessage("数据库未找到该信息");
+			 return result;
+		 }
+		 syPackingListFabric.setStatus("1");
+		 syPackingListFabricService.updateById(syPackingListFabric);
+		 result.setSuccess(true);
+		 result.setMessage("成功提交");
+		 result.setResult(syPackingListFabric);
+		 return result;
+	 }
+
+	 /**
+	  * 提交
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "装箱单面料-取消提交")
+	 @ApiOperation(value="装箱单面料-取消提交", notes="装箱单面料-取消提交")
+	 @PostMapping(value = "/cancelSubmit")
+	 public Result<SyPackingListFabric> cancelSubmit(String id) {
+		 Result<SyPackingListFabric> result=new Result<>();
+		 if(oConvertUtils.isEmpty(id)){
+			 result.setSuccess(false);
+			 result.setMessage("id为空");
+			 return result;
+		 }
+		 SyPackingListFabric syPackingListFabric=syPackingListFabricService.getById(id);
+		 if (syPackingListFabric==null){
+			 result.setSuccess(false);
+			 result.setMessage("数据库未找到该信息");
+			 return result;
+		 }
+		 syPackingListFabric.setStatus("0");
+		 syPackingListFabricService.updateById(syPackingListFabric);
+		 result.setSuccess(true);
+		 result.setMessage("已取消提交");
+		 result.setResult(syPackingListFabric);
+		 return result;
+	 }
 	
 	/**
 	 * 编辑

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -104,7 +105,14 @@ public class SyPackingListFabric implements Serializable {
 	/**附件*/
 	@ApiModelProperty(value = "附件")
 	private String accessory;
-
+	/**剩余数量*/
+	@Excel(name = "剩余数量", width = 15)
+	@ApiModelProperty(value = "剩余数量")
+	private java.math.BigDecimal remainingQuantity;
+	/**数量*/
+	@Excel(name = "数量", width = 15)
+	@ApiModelProperty(value = "数量")
+	private java.math.BigDecimal quantity;
 	/**子表数据*/
 	@TableField(exist = false)
 	@ApiModelProperty(value = "子表数据")

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

@@ -62,9 +62,11 @@
         LEFT JOIN sy_shipping_details_item b
     ON a.id = b.shipping_details_id AND b.del_flag = 0
     WHERE  a.del_flag = 0  /*查询未删除的数据*/
-    /*and a.state=1*/  /*查询已提交的数据*/
+    and b.submit_status=1  /*查询已提交的数据*/
     AND ( inventory_ccode NOT LIKE '19%' OR inventory_ccode IS NULL)/*查询不是成衣的数据*/
-    ORDER BY a.document_no DESC) AS t
+    group by b.group_id
+    ORDER BY a.document_no DESC
+    ) AS t
     ${ew.customSqlSegment}
     </select>
 

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

@@ -48,6 +48,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		syPackingListFabricMapper.insert(syPackingListFabric);
 		Map<String,String> mapId=new HashMap<String, String>();//key为发运明细子表id，value为分组id
 		for(SyPackingListFabricItem entity:syPackingListFabric.getSyPackingListFabricItem()) {
+			entity.setRemainingQuantity(entity.getInventoryQuantity());//入库数量
 			String key=entity.getSyShippingDetailsId();//获取发运明细子表id
 			if(!mapId.containsKey(key)){//如果这个发运明细id没有分组id,就生成一个新的分组id
 				mapId.put(key,oConvertUtils.getId());