代码补充

srm-module-code/src/main/java/org/jeecg/modules/afterCode/controller/AfterComplaintController.java

@@ -16,6 +16,8 @@ import org.jeecg.modules.afterCode.service.IAfterComplaintProductService;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.cuspCode.entity.CuspSupplierProfile;
 import org.jeecg.modules.cuspCode.service.ICuspSupplierProfileService;
+import org.jeecg.modules.purCode.entity.PurOrder;
+import org.jeecg.modules.purCode.service.IPurOrderService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -68,6 +70,8 @@ public class AfterComplaintController {
 	private IAfterComplaintProductService afterComplaintProductService;
 	 @Autowired
 	 private ISerialPatternService serialPatternService;
+	 @Autowired
+	 private IPurOrderService purOrderService;
 
 	 @Autowired
 	 private ICuspSupplierProfileService cuspSupplierProfileService;
@@ -114,6 +118,22 @@ public class AfterComplaintController {
 		BeanUtils.copyProperties(afterComplaintPage, afterComplaint);
 
 		String code = afterComplaint.getBillCode();
+		String purNumber = afterComplaint.getPurNumber();
+		if(StringUtils.isNotBlank(purNumber)){
+
+			QueryWrapper<PurOrder> queryWrapper = new QueryWrapper();
+			queryWrapper.eq("bill_code", purNumber.trim());
+			queryWrapper.eq("del_flag", "0");
+
+			List<PurOrder> list = purOrderService.list(queryWrapper);
+			if (list.size() == 0) {
+				return Result.error("采购编码错误，请修改！");
+			}
+
+			afterComplaint.setPurId(list.get(0).getId());
+			afterComplaint.setPurNumber(list.get(0).getBillCode());
+
+		}
 		if (StringUtils.isNotBlank(code)) {
 
 			QueryWrapper<AfterComplaint> queryWrapper = new QueryWrapper();
@@ -182,6 +202,23 @@ public class AfterComplaintController {
 			}
 		}
 
+		String purNumber = afterComplaint.getPurNumber();
+		if(StringUtils.isNotBlank(purNumber)){
+
+			QueryWrapper<PurOrder> queryWrapper = new QueryWrapper();
+			queryWrapper.eq("bill_code", purNumber.trim());
+			queryWrapper.eq("del_flag", "0");
+
+			List<PurOrder> list = purOrderService.list(queryWrapper);
+			if (list.size() == 0) {
+				return Result.error("采购编码错误，请修改！");
+			}
+
+			afterComplaint.setPurId(list.get(0).getId());
+			afterComplaint.setPurNumber(list.get(0).getBillCode());
+
+		}
+
 		afterComplaintService.updateMain(afterComplaint, afterComplaintPage.getAfterComplaintShipList(), afterComplaintPage.getAfterComplaintProductList());
 		return Result.OK("编辑成功!");
 	}

srm-module-code/src/main/java/org/jeecg/modules/afterCode/entity/AfterComplaint.java

@@ -87,6 +87,12 @@ public class AfterComplaint implements Serializable {
     private String orderNumber;
 	//订单id
     private String orderId;
+    /**采购*/
+    @Excel(name = "采购编号(order number)", width = 15)
+    @ApiModelProperty(value = "订单编号(order number)")
+    private String purNumber;
+    //采购订单id
+    private String purId;
 	/**订单金额(order money)*/
 	@Excel(name = "订单金额(order money)", width = 15)
     @ApiModelProperty(value = "订单金额(order money)")

srm-module-code/src/main/java/org/jeecg/modules/afterCode/vo/AfterComplaintPage.java

@@ -85,6 +85,13 @@ public class AfterComplaintPage {
     private String orderNumber;
 	//订单id
 	private String orderId;
+
+	/**采购*/
+	@Excel(name = "采购编号(order number)", width = 15)
+	@ApiModelProperty(value = "订单编号(order number)")
+    private String purNumber;
+	//采购订单id
+	private String purId;
 	/**订单金额(order money)*/
 	@Excel(name = "订单金额(order money)", width = 15)
 	@ApiModelProperty(value = "订单金额(order money)")

srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurOrderController.java

@@ -205,6 +205,30 @@ public class PurOrderController {
     }
 
 
+    /**
+     * 采购订单弹框明细（到货单使用）
+     *
+     * @param saleInquiryForm
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "采购订单弹框明细", notes = "采购订单弹框明细")
+    @GetMapping(value = "/selectPurOrderDetailAfter")
+    @PermissionData(pageComponent = "purchase/purchaseOrder/PurchaseOrderFormList")
+    public Result<IPage<PurOrderAlert>> selectPurOrderDetailAfter(PurOrderAlert saleInquiryForm,
+                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  HttpServletRequest req) {
+
+        QueryWrapper<PurOrderAlert> queryWrapper = QueryGenerator.initQueryWrapper(saleInquiryForm, req.getParameterMap());
+        Page<PurOrderAlert> page = new Page<PurOrderAlert>(pageNo, pageSize);
+        IPage<PurOrderAlert> pageList = purOrderProductService.selectPurOrderDetailAfter(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
     /**
      * 添加
      *

srm-module-code/src/main/java/org/jeecg/modules/purCode/mapper/PurOrderProductMapper.java

@@ -41,4 +41,5 @@ public interface PurOrderProductMapper extends BaseMapper<PurOrderProduct> {
 	 * @return
 	 */
 	public IPage<PurOrderAlert> selectPurOrderDetailAlert(Page<PurOrderAlert> page, @Param("ew") QueryWrapper<PurOrderAlert> queryWrapper);
+	public IPage<PurOrderAlert> selectPurOrderDetailAfter(Page<PurOrderAlert> page, @Param("ew") QueryWrapper<PurOrderAlert> queryWrapper);
 }

srm-module-code/src/main/java/org/jeecg/modules/purCode/mapper/xml/PurOrderProductMapper.xml

@@ -41,6 +41,7 @@
 			 ,b.tax_price
 			 ,b.tax_amount
 			 ,b.arrival_quantity
+			 ,b.tax_price_original
 
 			 , b.notes childNotes
 
@@ -56,4 +57,50 @@
 			 ) a
 			${ew.customSqlSegment}
 	</select>
+
+	<select id="selectPurOrderDetailAfter" parameterType="java.lang.String" resultType="org.jeecg.modules.purCode.vo.PurOrderAlert">
+		select *
+		from ( select a.id            headId
+			 , b.id            child_id
+			 , a.model         head_model
+			 , b.model         child_model
+
+			 , b.delivery_time delivery_time
+			 , a.*
+			 , b.product_id
+			 , b.chinese_name
+			 , b.product_code
+			 , b.product_class
+			 , b.english_name
+			 , b.specifications
+			 , b.partno
+			 , b.drawingno
+			 , b.orderno
+			 , b.factory
+			 , b.quality_grade
+			 , b.quantity
+			 , b.earliest_delivery_date
+			 , b.latest_delivery_date
+
+			 ,b.tax_price
+			 ,b.tax_amount
+			 ,b.arrival_quantity
+			 ,b.tax_price_original
+
+			 , b.notes childNotes
+
+		from after_complaint c
+			left join pur_order a on a.id = c.pur_id
+			left join pur_order_product b on a.id = b.head_id
+			left join base_project_archive d on a.project = d.id
+
+		where a.del_flag = 0
+		  and a.status = 1
+		  and a.submit = 1
+		  and b.del_flag = 0
+		  and c.del_flag = 0 and c.deal_result='索赔' and c.deal='处理中' and c.pur_id is not null
+		  and d.status = 1 order by b.create_time asc
+			 ) a
+			${ew.customSqlSegment}
+	</select>
 </mapper>

srm-module-code/src/main/java/org/jeecg/modules/purCode/service/IPurOrderProductService.java

@@ -26,6 +26,7 @@ public interface IPurOrderProductService extends IService<PurOrderProduct> {
 	public List<PurOrderProduct> selectByMainId(String mainId);
 
 	public IPage<PurOrderAlert> selectPurOrderDetailAlert(Page<PurOrderAlert> page, QueryWrapper<PurOrderAlert> queryWrapper);
+	public IPage<PurOrderAlert> selectPurOrderDetailAfter(Page<PurOrderAlert> page, QueryWrapper<PurOrderAlert> queryWrapper);
 
 	/**
 	 * 通过主表id查询子表，带采购折扣前单价和折扣

srm-module-code/src/main/java/org/jeecg/modules/purCode/service/impl/PurOrderProductServiceImpl.java

@@ -63,6 +63,11 @@ public class PurOrderProductServiceImpl extends ServiceImpl<PurOrderProductMappe
 		return purOrderProductMapper.selectPurOrderDetailAlert(page,queryWrapper);
 	}
 
+	@Override
+	public IPage<PurOrderAlert> selectPurOrderDetailAfter(Page<PurOrderAlert> page, QueryWrapper<PurOrderAlert> queryWrapper){
+		return purOrderProductMapper.selectPurOrderDetailAfter(page,queryWrapper);
+	}
+
 	/**
 	 * 通过主表id查询子表，带采购折扣前单价和折扣
 	 * @param mainId

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderAlert.java

@@ -300,6 +300,8 @@ public class PurOrderAlert implements Serializable {
     private String childNotes;
     @ApiModelProperty(value = "已到货数量(到货单已参照数量)")
     private java.math.BigDecimal arrivalQuantity;
+    //折前单价
+    private java.math.BigDecimal taxPriceOriginal;
 //    /**参照来源id*/
 //    @Excel(name = "参照来源id", width = 15)
 //    @ApiModelProperty(value = "参照来源id")