diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index e257b984..778f0060 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -9,10 +9,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.basic.UdiRlSupEntity; +import com.glxp.api.entity.basic.*; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; @@ -234,6 +231,11 @@ public class UdiRlSupController extends BaseController { if (vailResult != null) return ResultVOUtils.error(500, vailResult); companyProductsRelService.insertCompanyProducts(udiInfoExportRequest); + + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setId(Long.parseLong(rlidStr)); + udiRelevanceEntity.setLockStatus(1); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiProductEntity udiProductEntity = new UdiProductEntity(); BeanUtils.copyProperties(udiProductEntity, udiInfoExportRequest.getSupplementRequest()); udiProductService.insertUdiInfo(udiProductEntity); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 9416701e..211db1b2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -149,15 +149,12 @@ public class IoOrderDetailBizController extends BaseController { // todo 查询产品是否已经通过认证 if (isVailCert && udiRelevanceResponse.isNeedCert()) { - SupProductEntity supProductEntity = supProductService.findByRelIdFk(udiRelevanceResponse.getId() + ""); if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) { } else { return ResultVOUtils.error(500, "产品资质证书未通过审核！"); } - - } IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 2ab3c3e5..8baa25a6 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -219,6 +219,11 @@ public class PurOrderController { } + public void genOrder() { + + } + + /** * 查询采购订单列表 */ diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java index 1669fbcb..0cb7095b 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java @@ -4,7 +4,9 @@ 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 java.util.Date; + import lombok.Data; @Data @@ -18,6 +20,9 @@ public class PurOrderEntity { */ @TableField(value = "billNo") private String billNo; + @TableField(value = "supId") + private String supId; + /** * 单据日期 diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 922b793a..3ced6ef1 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -145,6 +145,7 @@ public class FilterOrderRequest extends ListPageRequest { * 退货单管理界面： supReturned * 采购入库单界面： supPurchase * 发票登记界面： supInvoice + * 出入库明细账 norDetail */ private String actionType; diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java index 93294cb3..06f024ce 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java @@ -76,4 +76,7 @@ public class PurOrderResponse { private String emergency; private Date arrivalTime; + + private String supId; + private String supName; } diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml index b5efe840..77f29b26 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml @@ -1,94 +1,97 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`, - createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser, - applyAuditUser, applyRemark, applyBillNo, stockOrderNo - + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`, + createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser, + applyAuditUser, applyRemark, applyBillNo, stockOrderNo,supId + - + SELECT pur_order.*, + cb.employeeName createUserName, + ab.employeeName auditUserName, + auth_warehouse.NAME invName, + auth_dept.`name` deptName + FROM pur_order + LEFT JOIN auth_user cb ON pur_order.createUser = cb.id + LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id + LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code` + LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode + + + AND billNo = #{billNo} + + + = #{startDate} + ]]> + + + + + + = #{startAuditDate} + ]]> + + + + + + and pur_order.status = #{status} + + + and (pur_order.status = 3 or pur_order.status = 2 or pur_order.status = 4) + + + and (pur_order.status = 1 or pur_order.status = 2 or pur_order.status = 4) + - SELECT - pur_order.*, - cb.employeeName createUserName, - ab.employeeName auditUserName, - auth_warehouse.NAME invName, - auth_dept.`name` deptName - FROM - pur_order - LEFT JOIN auth_user cb ON pur_order.createUser = cb.id - LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id - LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code` - LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode - - - AND billNo = #{billNo} - - - = #{startDate}]]> - - - - - - = #{startAuditDate}]]> - - - - - - and pur_order.status = #{status} - - - and ( pur_order.status = 3 or pur_order.status=2 or pur_order.status=4) - - - and ( pur_order.status = 1 or pur_order.status=2 or pur_order.status=4) - - - - AND deptCode = #{deptCode} - - - AND invCode = #{invCode} - - - AND auditUser = #{auditUser} - - - AND createUser = #{createUser} - - - - - - - \ No newline at end of file + + AND deptCode = #{deptCode} + + + AND invCode = #{invCode} + + + AND auditUser = #{auditUser} + + + AND createUser = #{createUser} + + + + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 816cd0f4..6f2ddfa4 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -76,6 +76,7 @@ CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1); CALL Pro_Temp_ColumnWork('pur_order', 'emergency', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);