2023-03-28

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/entity/ZyOrdersJk.java

@@ -82,4 +82,9 @@ public class ZyOrdersJk implements Serializable {
 	@Dict(dicCode = "delivery_status")
     @ApiModelProperty(value = "交付状态")
     private java.lang.Integer deliveryStatus;
+
+	/**顾客量体id*/
+	@Excel (name = "顾客量体id", width = 15, dictTable = "customer_measure", dicText = "username", dicCode = "id")
+	@ApiModelProperty (value = "顾客量体id")
+	private java.lang.String measureId;
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java

@@ -217,7 +217,7 @@ public class ZyOrdersServiceImpl extends ServiceImpl<ZyOrdersMapper, ZyOrders> i
             orderGoods.setGoodsName(zyGoods.getGoodsName());
             orderGoods.setGoodsIntr(zyGoods.getGoodsIntr());
             orderGoods.setCustomized(zyGoods.getCustomized());
-            orderGoods.setMeasureId(orderGoodsJkList.get(j).getMeasureId());
+            orderGoods.setMeasureId(zyOrdersJk.getMeasureId());
             orderGoods.setGoodsPicture(zyGoods.getGoodsPicture());
             orderGoods.setDefaultPicture(zyGoods.getDefaultPicture());
             orderGoods.setGoodsVideo(zyGoods.getGoodsVideo());

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/entity/ZyOperationtool.java

@@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -73,8 +74,9 @@ public class ZyOperationtool implements Serializable {
 	@Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "工具")
     private String toolid;
-
+    @TableField (exist = false)
     private String processCode;
+    @TableField(exist = false)
     private String code;
 
 }

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

@@ -192,4 +192,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     @Select("select id from customer_invoice where user_id =#{needuname}")
     List<String> getuserfapiao(String needuname);
+
+
+    @Select("select id from customer_measure where user_id =#{needuname}")
+    List<String> getusermeasureId(String needuname);
 }

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

@@ -580,11 +580,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		String needuname = sysUser.getId();
 		List<String> dizhi = userMapper.getuserdizhi(needuname);
 		List<String> fapiao = userMapper.getuserfapiao(needuname);
+		List<String> measureId = userMapper.getusermeasureId(needuname);
 		SysUserdfVO sdfvo = new SysUserdfVO();
 		sdfvo.setSysUser(sysUser);
 		sdfvo.setDizhi(dizhi);
 		sdfvo.setFapiao(fapiao);
-		System.out.println(sdfvo);
+		//量体
+		if(measureId.size()>0)
+		{
+			sdfvo.setMeasureId(measureId.get((measureId.size()-1)));
+		}
+
+		//System.out.println(sdfvo);
 		return sdfvo;
 	}
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysUserdfVO.java

@@ -1,7 +1,10 @@
 package org.jeecg.modules.system.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.List;
 
@@ -10,4 +13,8 @@ public class SysUserdfVO {
     private SysUser sysUser;
     private List<String> fapiao;
     private List<String> dizhi;
+    /**顾客量体id*/
+    @Excel (name = "顾客量体id", width = 15, dictTable = "customer_measure", dicText = "username", dicCode = "id")
+    @ApiModelProperty (value = "顾客量体id")
+    private java.lang.String measureId;
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java

@@ -156,8 +156,10 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     @Autowired
     private ProductAccessoriesMapper productAccessoriesMapper;
      //产品工序面料
+     @Autowired
     private ProductProcessFabricMapper productProcessFabricMapper;
     //产品工序辅料
+    @Autowired
     private ProductProcessAccessoriesMapper productProcessAccessoriesMapper;
 
     /**
@@ -276,7 +278,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
                     //#region 产品工序-添加（服装款式类型中读取）
                     //根据服务款式表id 得到服装工序，然后在得到基本工序
                     QueryWrapper<ZyStyleModular> styleModularLWrapper=new  QueryWrapper<ZyStyleModular>();
-                    styleModularLWrapper.eq("type_id",ogModel.getStyleId());
+                    styleModularLWrapper.eq("style_id",ogModel.getStyleId());
                     List<ZyStyleModular>  zyStyleModularList=styleModularMapper.selectList(styleModularLWrapper);
 
                     //将工序保存到产品工序中