Merge branch 'develop'

run.sh

@@ -24,7 +24,7 @@ echo '----build image----'
 docker run -p ${app_port}:${app_port} --name ${app_name} --network yzbh_network \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
--v /home/build/${volume_name}/logs:/var/logs \
+-v /home/build/${volume_name}/logs:/home/ruoyi/logs \
 -v /home/files:/home/files \
 -d ${group_name}/${app_name}:${app_version}
 echo '----start container----'

src/main/java/cn/ezhizao/project/business/entrust/domain/BizEntrust.java

@@ -54,6 +54,7 @@ public class BizEntrust extends BaseEntity
     /** 停止委托 */
     @Excel(name = "停止委托")
     @ApiModelProperty(value = "停止委托")
+    @TableField(exist = false)
     private Integer isStop;
 
     @ApiModelProperty("工作月")

src/main/java/cn/ezhizao/project/business/order/domain/BizArchiveInput.java

@@ -243,4 +243,5 @@ public class BizArchiveInput extends BaseEntity {
     private Integer isOther;
     @TableField(exist = false)
     private Long customerLabelId;
+    private String boss;
 }

src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -18,6 +18,8 @@ import cn.ezhizao.project.business.collection.domain.BizCollection;
 import cn.ezhizao.project.business.collection.domain.BizCollectionDetail;
 import cn.ezhizao.project.business.collection.service.IBizCollectionDetailService;
 import cn.ezhizao.project.business.collection.service.impl.BizCollectionServiceImpl;
+import cn.ezhizao.project.business.company.domain.BizCompany;
+import cn.ezhizao.project.business.company.service.IBizCompanyService;
 import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
 import cn.ezhizao.project.business.order.domain.BizArchiveInput;
@@ -27,9 +29,11 @@ import cn.ezhizao.project.business.order.service.impl.BizArchiveInputServiceImpl
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderDetail;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderNoContract;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderDetailService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -79,6 +83,9 @@ public class BizWorkOrderController extends BaseController {
     @Resource
     private IBizWorkOrderDetailService bizWorkOrderDetailService;
 
+    @Resource
+    private IBizCompanyService companyService;
+
     /**
      * 查询工单信息列表
      */
@@ -364,8 +371,20 @@ public class BizWorkOrderController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:workOrder:remove')")
     @Log(title = "工单信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult remove(@PathVariable List<Long> ids) {
-        return toAjax(bizWorkOrderService.removeBatchByIds(ids));
+
+        List<BizWorkOrder> list = bizWorkOrderService.list(new LambdaQueryWrapper<BizWorkOrder>().in(BizWorkOrder::getId, ids));
+        for (BizWorkOrder item : list) {
+            Long id = item.getId();
+            Long companyId = item.getCompanyId();
+            List<BizEntrust> bizEntrusts = entrustService.list(new LambdaQueryWrapper<BizEntrust>().eq(BizEntrust::getWorkOrderId, id).eq(BizEntrust::getCompanyId, companyId));
+            if (!CollectionUtils.isEmpty(bizEntrusts)){
+                String  compName = companyService.getById(companyId).getName();
+                return error( compName + "该工单已经委托给工厂，请先取消委托!");
+            }
+        }
+        return toAjax(bizWorkOrderService.removeBatchByIds(list));
     }
 
     @PreAuthorize("@ss.hasAnyPermi('business:customer:service:once:transactor,business:customer:service:loop:transactor')")

src/main/resources/application-dev.yml

@@ -86,6 +86,7 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+            socket-timeout: 3600000
 # 文件上传
 ruoyi:
     profile: /home/ruoyi/yzbh/

src/main/resources/application-linux.yml

@@ -82,6 +82,7 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+            socket-timeout: 3600000
 # 文件上传
 ruoyi:
     profile: /home/files/yzbh/

src/main/resources/mybatis/business/BizArchiveInputMapper.xml

@@ -46,6 +46,7 @@
         SELECT
         t1.*,
         t2.name as company_name,
+        t1.boss,
         t2.customer_label_id as customerLabelId,
         t2.social_credit_code as social_credit_code,
         t3.nick_name as signer_name,