楚江ERP:订货单-增、删、改、查接口调试

@@ -5,7 +5,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDate;
 import java.time.LocalDate;
+import java.util.List;
+
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 
 
 import lombok.Data;
 import lombok.Data;
@@ -200,6 +203,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     @ApiModelProperty("实际订货数量")
     @ApiModelProperty("实际订货数量")
     private String actualOrderNumber;
     private String actualOrderNumber;
 
 
+    /**
+     * 订货单表物料行
+     */
+    @ApiModelProperty("订货单表物料行")
+    private List<PurchaseOrderLine> purchaseOrderLineList;
+
 
 
 
 
     public GetPurchaseOrderInfoBo() {
     public GetPurchaseOrderInfoBo() {

@@ -5,12 +5,17 @@ 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.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
+
+import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 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;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
@@ -18,6 +23,7 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -39,7 +45,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
 
 
     @Autowired
     @Autowired
     private PurchaseOrderInfoService purchaseOrderInfoService;
     private PurchaseOrderInfoService purchaseOrderInfoService;
-
+    @Resource
+    private PurchaseOrderLineService purchaseOrderLineService;
     /**
     /**
      * 查询列表
      * 查询列表
      */
      */
@@ -66,7 +73,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     @ApiOperation("根据ID查询")
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @HasPermission({"purchaseOrderInfo:purchaseorderinfo:query"})
     @HasPermission({"purchaseOrderInfo:purchaseorderinfo:query"})
-    @GetMapping
+    @GetMapping("/get")
     public InvokeResult<GetPurchaseOrderInfoBo> get(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<GetPurchaseOrderInfoBo> get(@NotBlank(message = "id不能为空！") String id) {
 
 
         PurchaseOrderInfo data = purchaseOrderInfoService.findById(id);
         PurchaseOrderInfo data = purchaseOrderInfoService.findById(id);
@@ -75,6 +82,13 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         }
         }
 
 
         GetPurchaseOrderInfoBo result = new GetPurchaseOrderInfoBo(data);
         GetPurchaseOrderInfoBo result = new GetPurchaseOrderInfoBo(data);
+        QueryPurchaseOrderLineVo vo = new QueryPurchaseOrderLineVo();
+        vo.setPurchaseOrderId(id);
+        List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.query(vo);
+        if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) {
+            result.setPurchaseOrderLineList(purchaseOrderLineList);
+        }
+
 
 
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);
     }
     }
@@ -84,8 +98,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
     @HasPermission({"purchaseOrderInfo:purchaseorderinfo:add"})
     @HasPermission({"purchaseOrderInfo:purchaseorderinfo:add"})
-    @PostMapping
-    public InvokeResult<Void> create(@Valid CreatePurchaseOrderInfoVo vo) {
+    @PostMapping("/create")
+    public InvokeResult<Void> create(@Valid @RequestBody CreatePurchaseOrderInfoVo vo) {
 
 
         purchaseOrderInfoService.create(vo);
         purchaseOrderInfoService.create(vo);
 
 
@@ -97,8 +111,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
     @HasPermission({"purchaseOrderInfo:purchaseorderinfo:modify"})
     @HasPermission({"purchaseOrderInfo:purchaseorderinfo:modify"})
-    @PutMapping
-    public InvokeResult<Void> update(@Valid UpdatePurchaseOrderInfoVo vo) {
+    @PutMapping("/update")
+    public InvokeResult<Void> update(@Valid @RequestBody UpdatePurchaseOrderInfoVo vo) {
 
 
         purchaseOrderInfoService.update(vo);
         purchaseOrderInfoService.update(vo);
 
 
@@ -111,7 +125,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     @ApiOperation("根据ID删除")
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @HasPermission({"purchaseOrderInfo:purchaseorderinfo:delete"})
     @HasPermission({"purchaseOrderInfo:purchaseorderinfo:delete"})
-    @DeleteMapping
+    @DeleteMapping("/deleteById")
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 
 
         purchaseOrderInfoService.deleteById(id);
         purchaseOrderInfoService.deleteById(id);

@@ -16,14 +16,14 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
-import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
-import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
-import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
-import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
+import com.lframework.xingyun.sc.vo.order.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -37,6 +37,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
 
 
     @Resource
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private CustomerCreditService customerCreditService;
 
 
     @Override
     @Override
     public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
     public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
@@ -59,7 +61,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     @Override
     @Override
     public PurchaseOrderInfo findById(String id) {
     public PurchaseOrderInfo findById(String id) {
 
 
-        return getBaseMapper().selectById(id);
+        return getBaseMapper().findById(id);
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "新增订货单表，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "新增订货单表，ID：{}", params = {"#id"})
@@ -77,6 +79,15 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         }
         }
         if (!StringUtil.isBlank(vo.getOrderingUnit())) {
         if (!StringUtil.isBlank(vo.getOrderingUnit())) {
             data.setOrderingUnit(vo.getOrderingUnit());
             data.setOrderingUnit(vo.getOrderingUnit());
+            //根据客户id查出客户资信,资信状态不为取消
+            QueryCustomerCreditVo queryVo = new QueryCustomerCreditVo();
+            queryVo.setCompanyId(vo.getOrderingUnit());
+            queryVo.setStatusCancel("CANCEL");
+            List<CustomerCredit> query = customerCreditService.query(queryVo);
+            if (CollectionUtils.isNotEmpty(query)) {
+                CustomerCredit customerCredit = query.get(0);
+                data.setCustomerCreditId(customerCredit.getId());
+            }
         }
         }
         if (vo.getOrderDate() != null) {
         if (vo.getOrderDate() != null) {
             data.setOrderDate(vo.getOrderDate());
             data.setOrderDate(vo.getOrderDate());
@@ -135,9 +146,6 @@ 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.getCustomerCreditId())) {
-            data.setCustomerCreditId(vo.getCustomerCreditId());
-        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -194,6 +202,14 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
 
 
+        //更新订货单表物料行
+        List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList = vo.getUpdatePurchaseOrderLineVoList();
+        if (CollectionUtils.isNotEmpty(updatePurchaseOrderLineVoList)) {
+            for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : updatePurchaseOrderLineVoList) {
+                purchaseOrderLineService.update(updatePurchaseOrderLineVo);
+            }
+        }
+
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
     }
     }

@@ -21,4 +21,6 @@ public interface PurchaseOrderInfoMapper extends BaseMapper<PurchaseOrderInfo> {
      * @return
      * @return
      */
      */
     List<PurchaseOrderInfo> query(@Param("vo") QueryPurchaseOrderInfoVo vo);
     List<PurchaseOrderInfo> query(@Param("vo") QueryPurchaseOrderInfoVo vo);
+
+    PurchaseOrderInfo findById(@Param("id") String id);
 }
 }

@@ -32,13 +32,13 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
     /**
     /**
      * 订货开始日期
      * 订货开始日期
      */
      */
-    @ApiModelProperty("登记开始日期")
+    @ApiModelProperty("订货开始日期")
     private String orderDateStart;
     private String orderDateStart;
 
 
     /**
     /**
      * 订货结束日期
      * 订货结束日期
      */
      */
-    @ApiModelProperty("登记结束日期")
+    @ApiModelProperty("订货结束日期")
     private String orderDateEnd;
     private String orderDateEnd;
 
 
     /**
     /**

@@ -8,6 +8,7 @@ import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.List;
 
 
 @Data
 @Data
 public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
 public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
@@ -184,4 +185,10 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
     @ApiModelProperty("客户资信Id")
     @ApiModelProperty("客户资信Id")
     private String customerCreditId;
     private String customerCreditId;
 
 
+    /**
+     * 订货单表物料行
+     */
+    @ApiModelProperty("订货单表物料行")
+    private List<UpdatePurchaseOrderLineVo> updatePurchaseOrderLineVoList;
+
 }
 }

@@ -92,11 +92,11 @@
                 AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
                 AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
             </if>
             </if>
             <if test="vo.orderDateStart != null">
             <if test="vo.orderDateStart != null">
-                AND tb.order_date >= #{vo.orderDate}
+                AND tb.order_date >= #{vo.orderDateStart}
             </if>
             </if>
             <if test="vo.orderDateEnd != null">
             <if test="vo.orderDateEnd != null">
                 <![CDATA[
                 <![CDATA[
-               AND tb.order_date <= #{vo.orderDate}
+               AND tb.order_date <= #{vo.orderDateEnd}
                 ]]>
                 ]]>
             </if>
             </if>
             <if test="vo.status != null and vo.status != ''">
             <if test="vo.status != null and vo.status != ''">
@@ -114,4 +114,13 @@
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.PurchaseOrderInfo">
+        <include refid="PurchaseOrderInfo_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
+            </if>
+        </where>
+    </select>
 </mapper>
 </mapper>