Merge remote-tracking branch 'origin/master_0929' into master_0929

yeqianyong
2 parents db4cbddb de53ff00
Showing 4 changed files with 129 additions and 26 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractFrameworkController.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
xingyun-sc/src/main/resources/templates/foreignStandardContractTemplate.xls
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java
View file @9701696
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java
View file @9701696
@@ -21,9 +21,7 @@ import com.lframework.starter.web.inner.service.GenerateCodeService;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
-import com.lframework.xingyun.basedata.entity.Customer;
-import com.lframework.xingyun.basedata.entity.ProductVariety;
-import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.entity.*;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.product.ProductVarietyService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
@@ -124,7 +122,15 @@ public class ContractDistributorStandardController extends DefaultBaseController
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"contract:contractDistributorStandard:query"})
+    @HasPermission({
+            "contract-manage:distribution-standard-contract:query",
+            "contract-manage:distribution-inventory-contract:query",
+            "contract-manage:distribution-unlocked-contract:query",
+            "contract-manage:foreign-trade-standard-contract:query",
+            "contract-manage:foreign-trade-inventory-contract:query",
+            "contract-manage:foreign-trade-unlocked-contract:query",
+            "contract-manage:processed-standard-contract:query"
+    })
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryContractDistributorStandardBo>> query(@Valid QueryContractDistributorStandardVo vo) {
         if (vo != null && StringUtils.isNotBlank(vo.getBuyerName())) {
@@ -224,7 +230,15 @@ public class ContractDistributorStandardController extends DefaultBaseController
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"contract:contractDistributorStandard:query"})
+    @HasPermission({
+            "contract-manage:distribution-standard-contract:query",
+            "contract-manage:distribution-inventory-contract:query",
+            "contract-manage:distribution-unlocked-contract:query",
+            "contract-manage:foreign-trade-standard-contract:query",
+            "contract-manage:foreign-trade-inventory-contract:query",
+            "contract-manage:foreign-trade-unlocked-contract:query",
+            "contract-manage:processed-standard-contract:query"
+    })
     @GetMapping
     public InvokeResult<GetContractDistributorStandardBo> get(@NotBlank(message = "id不能为空！") String id) {
@@ -310,7 +324,15 @@ public class ContractDistributorStandardController extends DefaultBaseController
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"contract:contractDistributorStandard:add"})
+    @HasPermission({
+            "contract-manage:distribution-standard-contract:add",
+            "contract-manage:distribution-inventory-contract:add",
+            "contract-manage:distribution-unlocked-contract:add",
+            "contract-manage:foreign-trade-standard-contract:add",
+            "contract-manage:foreign-trade-inventory-contract:add",
+            "contract-manage:foreign-trade-unlocked-contract:add",
+            "contract-manage:processed-standard-contract:add"
+    })
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateContractDistributorStandardVo vo) {
         if (CollectionUtils.isEmpty(vo.getContractDistributorLineList()) && CollectionUtils.isEmpty(vo.getContractStdProcessingLineList())) {
@@ -321,6 +343,13 @@ public class ContractDistributorStandardController extends DefaultBaseController
             throw new DefaultClientException("合同类型不可为空！");
         }
+        Wrapper<ContractDistributorStandard> checkWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .eq(ContractDistributorStandard::getCode, vo.getCode())
+                .eq(ContractDistributorStandard::getType, vo.getType());
+        if (contractDistributorStandardService.count(checkWrapper) > 0) {
+            throw new DefaultClientException("编号重复，请重新输入！");
+        }
+
         //获取当前人员ID
         String currentUserId = SecurityUtil.getCurrentUser().getId();
         SysUser sysUser = sysUserService.findById(currentUserId);
@@ -333,7 +362,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
             }
         }
-        if("PROCESS_STD_AGMT".equals(vo.getType())) {
+        if ("PROCESS_STD_AGMT".equals(vo.getType())) {
             contractDistributorStandardService.createStdContract(vo);
         } else {
             contractDistributorStandardService.create(vo);
@@ -346,9 +375,25 @@ public class ContractDistributorStandardController extends DefaultBaseController
      * 修改
      */
     @ApiOperation("修改")
-    @HasPermission({"contract:contractDistributorStandard:modify"})
+    @HasPermission({
+            "contract-manage:distribution-standard-contract:modify",
+            "contract-manage:distribution-inventory-contract:modify",
+            "contract-manage:distribution-unlocked-contract:modify",
+            "contract-manage:foreign-trade-standard-contract:modify",
+            "contract-manage:foreign-trade-inventory-contract:modify",
+            "contract-manage:foreign-trade-unlocked-contract:modify",
+            "contract-manage:processed-standard-contract:modify"
+    })
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateContractDistributorStandardVo vo) {
+        //查询Code是否重复
+        Wrapper<ContractDistributorStandard> checkCodeWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .eq(ContractDistributorStandard::getCode, vo.getCode())
+                .eq(ContractDistributorStandard::getType, vo.getType())
+                .ne(ContractDistributorStandard::getId, vo.getId());
+        if (contractDistributorStandardService.count(checkCodeWrapper) > 0) {
+            throw new DefaultClientException("编号重复，请重新输入！");
+        }
         contractDistributorStandardService.update(vo);
@@ -358,7 +403,6 @@ public class ContractDistributorStandardController extends DefaultBaseController
     }
     @ApiOperation("获取code")
-    @HasPermission({"contract:contractDistributorStandard:add"})
     @GetMapping("/code")
     public InvokeResult<String> code() {
         StringBuilder stringBuilder = new StringBuilder();
@@ -384,6 +428,12 @@ public class ContractDistributorStandardController extends DefaultBaseController
      * 上传合同附件
      */
     @ApiOperation("上传合同附件")
+    @HasPermission({
+            "contract-manage:distribution-inventory-contract:upload",
+            "contract-manage:distribution-unlocked-contract:upload",
+            "contract-manage:foreign-trade-inventory-contract:upload",
+            "contract-manage:foreign-trade-unlocked-contract:upload"
+    })
     @PostMapping("/uploadFormalContract")
     public InvokeResult<Void> uploadFormalContract(@RequestBody UpdateContractDistributorStandardVo vo) {
         if (StringUtils.isBlank(vo.getFormalFileId()) || StringUtils.isBlank(vo.getId())) {
@@ -401,6 +451,15 @@ public class ContractDistributorStandardController extends DefaultBaseController
      * 上传标准合同附件
      */
     @ApiOperation("上传标准合同附件")
+    @HasPermission({
+            "contract-manage:distribution-standard-contract:upload",
+            "contract-manage:distribution-inventory-contract:standard-upload",
+            "contract-manage:distribution-unlocked-contract:standard-upload",
+            "contract-manage:foreign-trade-standard-contract:upload",
+            "contract-manage:foreign-trade-inventory-contract:standard-upload",
+            "contract-manage:foreign-trade-unlocked-contract:standard-upload",
+            "contract-manage:processed-standard-contract:upload"
+    })
     @PostMapping("/uploadStandardContract")
     public InvokeResult<Void> uploadStandardContract(@RequestBody UpdateContractDistributorStandardVo vo) {
         if (StringUtils.isBlank(vo.getStandardFileId()) || StringUtils.isBlank(vo.getId())) {
@@ -419,6 +478,11 @@ public class ContractDistributorStandardController extends DefaultBaseController
      * 上传双方盖章合同
      */
     @ApiModelProperty("上传双方盖章合同")
+    @HasPermission({
+            "contract-manage:foreign-trade-standard-contract:upload-seal",
+            "contract-manage:foreign-trade-inventory-contract:upload-seal",
+            "contract-manage:foreign-trade-unlcoked-contract:upload-seal"
+    })
     @PostMapping("/uploadSignedContractFile")
     public InvokeResult<Void> uploadSignedContractFile(@RequestBody UpdateContractDistributorStandardVo vo) {
         if (vo == null || StringUtils.isBlank(vo.getId())) {
@@ -436,6 +500,15 @@ public class ContractDistributorStandardController extends DefaultBaseController
      * 删除合同
      */
     @ApiOperation("删除")
+    @HasPermission({
+            "contract-manage:distribution-standard-contract:delete",
+            "contract-manage:distribution-inventory-contract:delete",
+            "contract-manage:distribution-unlocked-contract:delete",
+            "contract-manage:foreign-trade-standard-contract:delete",
+            "contract-manage:foreign-trade-inventory-contract:delete",
+            "contract-manage:foreign-trade-unlocked-contract:delete",
+            "contract-manage:processed-standard-contract:delete"
+    })
     @DeleteMapping
     public InvokeResult<Void> delete(@NotBlank(message = "id不能为空！") String id) {
@@ -492,6 +565,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
     }
     @ApiModelProperty("锁价")
+    @HasPermission({"contract-manage:distribution-inventory-contract:lock", "contract-manage:foreign-trade-inventory-contract:lock"})
     @PostMapping("/priceLock")
     public InvokeResult<Void> priceLock(@RequestBody UpdateContractDistributorStandardVo vo) {
         if (vo == null || StringUtils.isBlank(vo.getId())) {
@@ -506,6 +580,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
     }
     @ApiModelProperty("锁规")
+    @HasPermission({"contract-manage:distribution-unlocked-contract:lock", "contract-manage:foreign-trade-unlocked-contract:lock"})
     @PostMapping("/specificationLock")
     public InvokeResult<Void> specificationLock(@RequestBody UpdateContractDistributorStandardVo vo) {
         if (vo == null || StringUtils.isBlank(vo.getId())) {
@@ -523,6 +598,15 @@ public class ContractDistributorStandardController extends DefaultBaseController
      * 标准合同模版打印
      */
     @ApiOperation("标准合同模版打印")
+    @HasPermission({
+            "contract-manage:distribution-standard-contract:query",
+            "contract-manage:distribution-inventory-contract:query",
+            "contract-manage:distribution-unlocked-contract:query",
+            "contract-manage:foreign-trade-standard-contract:query",
+            "contract-manage:foreign-trade-inventory-contract:query",
+            "contract-manage:foreign-trade-unlocked-contract:query",
+            "contract-manage:processed-standard-contract:query"
+    })
     @GetMapping("/printStandardContract")
     public void printStandardContract(@NotBlank(message = "合同不可为空") String id, HttpServletResponse response) throws IOException {
         InvokeResult<GetContractDistributorStandardBo> result = get(id);
@@ -562,6 +646,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
                 || "INTL_INVENTORY_AGMT".equals(data.getType())
                 || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) { // 读取外贸合同模版
             templatePath = "templates/foreignStandardContractTemplate.xls";
+        } else if ("PROCESS_STD_AGMT".equals(data.getType())) { // 加工标准合同模版
+            templatePath = "templates/processStdAgmtTemplate.xls";
         }
         try {
@@ -575,11 +661,22 @@ public class ContractDistributorStandardController extends DefaultBaseController
                     DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                     int startRow = 6; // 产品开始行
                     String contractTitle = "销售订单（经销）";
+                    if ("INTL_STD_CONTRACT".equals(data.getType())
+                            || "INTL_INVENTORY_AGMT".equals(data.getType())
+                            || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
+                        contractTitle = "销售订单（外贸）";
+                    }
+
                     if (CollectionUtils.isNotEmpty(data.getContractDistributorLineList())) {
                         for (GetContractDistributorLineBo contractDistributorLineBo : data.getContractDistributorLineList()) {
                             if (StringUtils.isNotBlank(contractDistributorLineBo.getProductName())
                                     && !productNameList.contains(contractDistributorLineBo.getProductName().substring(0, 2))) {
                                 contractTitle = "销售合同（经销）";
+                                if ("INTL_STD_CONTRACT".equals(data.getType())
+                                        || "INTL_INVENTORY_AGMT".equals(data.getType())
+                                        || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
+                                    contractTitle = "销售合同（外贸）";
+                                }
                             }
                             setCellValue(sheet, startRow, 1, contractDistributorLineBo.getProductName()); // B列
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractFrameworkController.java
View file @9701696
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractFrameworkController.java
View file @9701696
@@ -84,14 +84,14 @@ public class ContractFrameworkController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"contract:contractFramework:query"})
+    @HasPermission({"contract-manage:contract-framework:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryContractFrameworkBo>> query(@Valid QueryContractFrameworkVo vo) {
-        if(vo != null && StringUtils.isNotBlank(vo.getCustomerName())) {
+        if (vo != null && StringUtils.isNotBlank(vo.getCustomerName())) {
             QueryCustomerVo queryCustomerVo = new QueryCustomerVo();
             queryCustomerVo.setName(vo.getCustomerName());
             List<Customer> customerList = customerService.query(queryCustomerVo);
-            if(CollectionUtils.isEmpty(customerList)) {
+            if (CollectionUtils.isEmpty(customerList)) {
                 PageResult<QueryContractFrameworkBo> boPageResult = new PageResult<>();
                 return InvokeResultBuilder.success(boPageResult);
             }
@@ -173,14 +173,14 @@ public class ContractFrameworkController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"contract:contractFramework:add"})
+    @HasPermission({"contract-manage:contract-framework:add"})
     @PostMapping
     public InvokeResult<String> create(@Valid CreateContractFrameworkVo vo) {
         return InvokeResultBuilder.success(contractFrameworkService.create(vo));
     }
     @ApiOperation("获取code")
-    @HasPermission({"contract:contractFramework:add"})
+    @HasPermission({"contract-manage:contract-framework:add", "contract-manage:contract-framework:modify"})
     @GetMapping("/code")
     public InvokeResult<String> code(String company) {
         StringBuilder stringBuilder = new StringBuilder();
@@ -209,7 +209,7 @@ public class ContractFrameworkController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"contract:contractFramework:query"})
+    @HasPermission({"contract-manage:contract-framework:query"})
     @GetMapping
     public InvokeResult<QueryContractFrameworkBo> get(@NotBlank(message = "id不能为空！") String id) {
@@ -261,7 +261,7 @@ public class ContractFrameworkController extends DefaultBaseController {
      * 修改
      */
     @ApiOperation("修改")
-    @HasPermission({"contract:contractFramework:modify"})
+    @HasPermission({"contract-manage:contract-framework:modify"})
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateContractFrameworkVo vo) {
@@ -279,7 +279,7 @@ public class ContractFrameworkController extends DefaultBaseController {
      * @return
      */
     @ApiOperation("导出")
-    @HasPermission({"contract:contractFramework:export"})
+    @HasPermission({"contract-manage:contract-framework:export"})
     @PostMapping("/export")
     public InvokeResult<Void> export(@Valid QueryContractFrameworkVo vo) {
         vo.setExportType(ExportType.CONTRACT_FRAMEWORK.getCode());
@@ -289,14 +289,14 @@ public class ContractFrameworkController extends DefaultBaseController {
     }
     @ApiOperation("下载导入模板")
-    @HasPermission({"contract:contractFramework:import"})
+    @HasPermission({"contract-manage:contract-framework:import"})
     @GetMapping("/import/template")
     public void downloadImportTemplate() {
         ExcelUtil.exportXls("合同框架导入模板", ContractFrameworkImportModel.class);
     }
     @ApiOperation("导入")
-    @HasPermission({"contract:contractFramework:import"})
+    @HasPermission({"contract-manage:contract-framework:import"})
     @PostMapping("/import")
     public InvokeResult<Void> importExcel(@NotBlank(message = "ID不能为空") String id,
                                           @NotNull(message = "请上传文件") MultipartFile file) {
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
View file @9701696
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
View file @9701696
@@ -148,13 +148,19 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) {
             //生产人员不展示价格,根据部门判断（生产管理科、精轧一车间、精轧车间、品质管理科）,需要生产的控制价格
             List<SysUserDept> userDeptList = sysUserDeptService.getByUserId(SecurityUtil.getCurrentUser().getId());
-            if (CollectionUtils.isNotEmpty(userDeptList)) {
-                SysUserDept sysUserDept = userDeptList.get(0);
-                String deptId = sysUserDept.getDeptId();
-                SysDept sysDept = sysDeptService.findById(deptId);
-                String name = sysDept.getName();
-                if (("生产管理科".equals(name) || "精轧一车间".equals(name) || "精轧车间".equals(name)
-                        || "品质管理科".equals(name)) && "PRODUCTION".equals(result.getType())) {
+            if (CollectionUtils.isNotEmpty(userDeptList) && "PRODUCTION".equals(result.getType())) {
+                boolean b = false;
+                for (SysUserDept sysUserDept : userDeptList) {
+                    String deptId = sysUserDept.getDeptId();
+                    SysDept sysDept = sysDeptService.findById(deptId);
+                    String name = sysDept.getName();
+                    if ("生产管理科".equals(name) || "精轧一车间".equals(name) || "精轧车间".equals(name)
+                            || "品质管理科".equals(name)) {
+                        b = true;
+                        break;
+                    }
+                }
+                if (b) {
                     for (PurchaseOrderLine purchaseOrderLine : purchaseOrderLineList) {
                         purchaseOrderLine.setSalesPrice(null);
                     }
--- a/xingyun-sc/src/main/resources/templates/foreignStandardContractTemplate.xls
View file @9701696
+++ b/xingyun-sc/src/main/resources/templates/foreignStandardContractTemplate.xls
View file @9701696