楚江ERP:订货单新增个类型（无需生产、需要生产）

@@ -222,6 +222,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     @ApiModelProperty("规格变更状态")
     @ApiModelProperty("规格变更状态")
     private String specChangeStatus;
     private String specChangeStatus;
 
 
+    /**
+     * 订货单类型（生产：PRODUCTION 无需生产：NO_PRODUCTION）
+     */
+    @ApiModelProperty("订货单类型")
+    private String type;
+
 
 
 
 
     public GetPurchaseOrderInfoBo() {
     public GetPurchaseOrderInfoBo() {

@@ -123,9 +123,9 @@ public class GetPurchaseOrderLineBo extends BaseBo<PurchaseOrderLine> {
     private BigDecimal salesPrice;
     private BigDecimal salesPrice;
 
 
     /**
     /**
-     * 交货日期
+     * 发货日期
      */
      */
-    @ApiModelProperty("交货日期")
+    @ApiModelProperty("发货日期")
     @JsonFormat(pattern = StringPool.DATE_PATTERN)
     @JsonFormat(pattern = StringPool.DATE_PATTERN)
     private LocalDate deliveryDate;
     private LocalDate deliveryDate;
 
 

@@ -9,9 +9,12 @@ import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.entity.SysRole;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
@@ -74,6 +77,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     private PurchaseOrderLineService purchaseOrderLineService;
     private PurchaseOrderLineService purchaseOrderLineService;
     @Autowired
     @Autowired
     private SysUserService sysUserService;
     private SysUserService sysUserService;
+    @Resource
+    private SysRoleService sysRoleService;
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -134,6 +139,23 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         vo.setPurchaseOrderId(id);
         vo.setPurchaseOrderId(id);
         List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.query(vo);
         List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.query(vo);
         if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) {
         if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) {
+            //生产人员不展示价格,生产人员角色只会有单个
+            List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());
+            if (CollectionUtils.isNotEmpty(sysRoleList)) {
+                Boolean b = false;
+                for (SysRole sysRole : sysRoleList) {
+                    //todo 生产人员角色未确定
+                    if ("scry".equals(sysRole.getCode())) {
+                        b = true;
+                        break;
+                    }
+                }
+                if (b) {
+                    for (PurchaseOrderLine purchaseOrderLine : purchaseOrderLineList) {
+                        purchaseOrderLine.setSalesPrice(null);
+                    }
+                }
+            }
             result.setPurchaseOrderLineList(purchaseOrderLineList);
             result.setPurchaseOrderLineList(purchaseOrderLineList);
         }
         }
 
 

@@ -180,6 +180,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String specChangeStatus;
     private String specChangeStatus;
 
 
     /**
     /**
+     * 订货单类型（生产：PRODUCTION 无需生产：NO_PRODUCTION）
+     */
+    private String type;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -168,6 +168,9 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (!StringUtil.isBlank(vo.getWorkshopId())) {
         if (!StringUtil.isBlank(vo.getWorkshopId())) {
             data.setWorkshopId(vo.getWorkshopId());
             data.setWorkshopId(vo.getWorkshopId());
         }
         }
+        if (!StringUtil.isBlank(vo.getType())) {
+            data.setType(vo.getType());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 

@@ -189,4 +189,10 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
     @ApiModelProperty("订货单物料行")
     @ApiModelProperty("订货单物料行")
     private List<CreatePurchaseOrderLineVo> createPurchaseOrderLineVoList;
     private List<CreatePurchaseOrderLineVo> createPurchaseOrderLineVoList;
 
 
+    /**
+     * 订货单类型（生产：PRODUCTION 无需生产：NO_PRODUCTION）
+     */
+    @ApiModelProperty("订货单类型")
+    private String type;
+
 }
 }

@@ -141,10 +141,10 @@ public class CreatePurchaseOrderLineVo implements BaseVo, Serializable {
     private BigDecimal salesPrice;
     private BigDecimal salesPrice;
 
 
     /**
     /**
-     * 交货日期
+     * 发货日期
      */
      */
-    @ApiModelProperty("交货日期")
-    @TypeMismatch(message = "交货日期格式有误！")
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
     private LocalDate deliveryDate;
     private LocalDate deliveryDate;
 
 
     /**
     /**

@@ -71,4 +71,10 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("生产厂")
     @ApiModelProperty("生产厂")
     private String workshopId;
     private String workshopId;
 
 
+    /**
+     * 订货单类型（生产：PRODUCTION 无需生产：NO_PRODUCTION）
+     */
+    @ApiModelProperty("订货单类型")
+    private String type;
+
 }
 }

@@ -32,10 +32,10 @@ public class QueryPurchaseOrderLineVo extends PageVo implements BaseVo, Serializ
     private String status;
     private String status;
 
 
     /**
     /**
-     * 交货日期
+     * 发货日期
      */
      */
-    @ApiModelProperty("交货日期")
-    @TypeMismatch(message = "交货日期格式有误！")
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
     private LocalDate deliveryDate;
     private LocalDate deliveryDate;
 
 
 }
 }

@@ -197,4 +197,10 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
     @ApiModelProperty("订货单表物料行")
     @ApiModelProperty("订货单表物料行")
     private List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList;
     private List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList;
 
 
+    /**
+     * 订货单类型（生产：PRODUCTION 无需生产：NO_PRODUCTION）
+     */
+    @ApiModelProperty("订货单类型")
+    private String type;
+
 }
 }

@@ -148,10 +148,10 @@ public class UpdatePurchaseOrderLineVo implements BaseVo, Serializable {
     private BigDecimal salesPrice;
     private BigDecimal salesPrice;
 
 
     /**
     /**
-     * 交货日期
+     * 发货日期
      */
      */
-    @ApiModelProperty("交货日期")
-    @TypeMismatch(message = "交货日期格式有误！")
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
     private LocalDate deliveryDate;
     private LocalDate deliveryDate;
 
 
     /**
     /**

@@ -32,6 +32,7 @@
         <result column="workshop_name" property="workshopName"/>
         <result column="workshop_name" property="workshopName"/>
         <result column="customer_credit_id" property="customerCreditId"/>
         <result column="customer_credit_id" property="customerCreditId"/>
         <result column="customer_tier" property="customerTier"/>
         <result column="customer_tier" property="customerTier"/>
+        <result column="type" property="type"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -71,6 +72,7 @@
             ws.name AS workshop_name,
             ws.name AS workshop_name,
             tb.customer_credit_id,
             tb.customer_credit_id,
             cc.company_suggested_category AS customer_tier,
             cc.company_suggested_category AS customer_tier,
+            tb.type,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,
@@ -116,6 +118,9 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
             </if>
+            <if test="vo.type != null and vo.type != ''">
+                AND tb.type = #{vo.type}
+            </if>
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>
@@ -155,6 +160,7 @@
             AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR
             AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR
             tb.revoke_status='PARTIAL')
             tb.revoke_status='PARTIAL')
             AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
             AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
+            AND tb.type ='PRODUCTION'
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>