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

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/OrderProductMapper.java

@@ -7,6 +7,7 @@ import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.operationManagementCenter.entity.Order;
 import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -26,6 +27,6 @@ public interface OrderProductMapper extends SuperMapper<OrderProduct> {
 
     List<OrderProduct> getList(OrderProduct bean);
 
-    IPage<OrderProduct> pageList(IPage page,@Param("orderNo")String orderNo,@Param("bomName")String bomName,@Param("produceStatus")String produceStatus, @Param(Constants.WRAPPER) Wrapper<OrderProduct> queryWrapper);
+    IPage<OrderProduct> pageList(IPage page, @Param("produceStatus")String produceStatus, @Param(Constants.WRAPPER) Wrapper<OrderProduct> queryWrapper, DataScope dataScope);
 
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/OrderProductService.java

@@ -21,6 +21,6 @@ public interface OrderProductService extends SuperService<OrderProduct> {
 
     List<OrderProduct> getlist(OrderProduct bean);
 
-    IPage<OrderProduct> pageList(IPage page,String orderNo,String bomName,String produceStatus, LbqWrapper<OrderProduct> wrapper);
+    IPage<OrderProduct> pageList(IPage page, String produceStatus, LbqWrapper<OrderProduct> wrapper);
 
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderProductServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
 import com.github.zuihou.business.operationManagementCenter.service.OrderProductService;
 import com.github.zuihou.base.service.SuperServiceImpl;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -34,7 +35,7 @@ public class OrderProductServiceImpl extends SuperServiceImpl<OrderProductMapper
 
 
     @Override
-    public IPage<OrderProduct> pageList(IPage page,String orderNo,String bomName,String produceStatus, LbqWrapper<OrderProduct> wrapper) {
-        return baseMapper.pageList(page, orderNo, bomName, produceStatus, wrapper);
+    public IPage<OrderProduct> pageList(IPage page, String produceStatus, LbqWrapper<OrderProduct> wrapper) {
+        return baseMapper.pageList(page, produceStatus, wrapper, new DataScope());
     }
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -709,7 +709,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     @Override
     public Map<String, Object> scheduleTaskByResource(Map<String, Object> map) {
         String taskBatchNo = map.get("taskBatchNo")==null?"":map.get("taskBatchNo").toString();
-        String draftFlag = map.get("draftFlag")==null?"":map.get("draftFlag").toString();
+        String draftFlag = map.get("draftFlag")==null?"0":map.get("draftFlag").toString();
         //参数放置位置处理
         getQueryMap(map);
         String planId = map.get("planId")==null?"":map.get("planId").toString();

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BomProcedureVersionServiceImpl.java

@@ -155,7 +155,10 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
                     //替换一下，避免字段名称重复
                     condition = custService.getCondBytablePri(" jtable"+j+".",condition);
 
-                    String joinSql = " left join "+prefix+joinTableName+" jtable"+j+" on a."+bean.getIdentifier() +" =jtable"+j+"."+field1 +" and "+condition;
+                    String joinSql = " left join "+prefix+joinTableName+" jtable"+j+" on a."+bean.getIdentifier() +" =jtable"+j+"."+field1;
+                    if(StringUtils.isNotEmpty(condition)){
+                        joinSql+=" and "+condition;
+                    }
                     joinSqlMap.put(bean.getIdentifier(),joinSql);
 
                     fields += "jtable"+j+"."+field2 +" as "+ bean.getIdentifier()+",";

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BomVersionInfoServiceImpl.java

@@ -1,9 +1,12 @@
 package com.github.zuihou.business.productionReadyCenter.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.zuihou.business.modelingCenter.dao.MModuleFieldMapper;
 import com.github.zuihou.business.modelingCenter.entity.MModuleField;
+import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
 import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureVersionMapper;
 import com.github.zuihou.business.productionReadyCenter.dao.BomVersionInfoMapper;
 import com.github.zuihou.business.productionReadyCenter.dto.BomVersionInfoSaveDTO;
@@ -58,6 +61,8 @@ public class BomVersionInfoServiceImpl extends SuperServiceImpl<BomVersionInfoMa
     private MModuleFieldMapper moduleFieldMapper;
     @Autowired
     private CodeRuleService codeRuleService;
+    @Autowired
+    private WorkpieceService workpieceService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -130,6 +135,11 @@ public class BomVersionInfoServiceImpl extends SuperServiceImpl<BomVersionInfoMa
     public BomVersionInfo updateUseStatus(BomVersionInfoUpdateDTO data){
         BomVersionInfo bean = BeanPlusUtil.toBean(data, BomVersionInfo.class);
         isFalse(!"2".equals(bean.getAuditStatus()),"请选择审核通过版本数据");
+
+        //当前是否有未完成的订单，
+        List<TWorkpiece>workpieceList = workpieceService.list(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getBomId, bean.getBomId()).eq(TWorkpiece::getIsEnd, "0"));
+        isFalse(CollectionUtil.isNotEmpty(workpieceList),"有进行中的订单，不能变更版本");
+
         //先把该产品的所有版本都置为未使用
         BomVersionInfo version = new BomVersionInfo();
         version.setUseStatus("0");

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/OrderProductMapper.xml

@@ -19,38 +19,29 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,update_time,bomName,order_no,unqualifiedCount,addOrderCount,
-        order_id, bom_id, bom_num, delivery_time, remark, create_user, update_user, prority,produceStatus
+        id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,completeNum,qualifiedCount,
+        order_id, bom_id, bom_num, orderDeliveryTime, remark, create_user, update_user, produce_status
     </sql>
 
     <!-- 分页 -->
     <select id="pageList" parameterType="String" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from (select a.*,b.name bomName,b.no as bomNo,b.specifications as specifications,b.model,b.brand,ifnull(c.planNum,0) as planNum,
-        (ifnull(a.bom_num,0)-ifnull(c.planNum,0)) as stayPlanNum,d.delivery_time as orderDeliveryTime,d.order_no orderNo,unqualifiedCount,addOrderCount,d.produce_status produceStatus
-        from imcs_o_order_product a
+        from (select a.*,a.plan_bom_num as bom_num, b.name as bomName,b.no as bomNo,b.specifications ,b.model,b.brand,
+        ifnull(completeNum, 0) as completeNum,d.start_time as orderDeliveryTime, ifnull(unqualifiedCount,0) as unqualifiedCount, ifnull(completeNum-unqualifiedCount, 0) as qualifiedCount,
+        ifnull(addOrderCount,0) as addOrderCount ,d.produce_status
+        from imcs_p_plan_product a
         left join imcs_b_bom b on a.bom_id = b.id
-        left join (
-          select order_product_id,count(1) as planNum from imcs_p_plan_product where 1=1 group by order_product_id
-        )c on a.id= c.order_product_id
-        left join imcs_o_order d on a.order_id = d.id
-
+        left join imcs_p_plan d on a.plan_id = d.id
         LEFT JOIN
-        (select order_product_id,count(1) unqualifiedCount,count(u.add_order_id)addOrderCount from
+        (select order_product_id,count(order_product_id) AS completeNum, count(1) as unqualifiedCount,count(u.add_order_id) as addOrderCount from
         imcs_t_task_test_unqualified_bom u
         GROUP BY u.order_product_id
         )e on a.id = e.order_product_id
         where 1=1
-        <if test="orderNo != null and orderNo != ''">
-            and d.order_no like concat('%', #{orderNo}, '%')
-        </if>
         <if test="produceStatus != null and produceStatus != ''">
             and d.produce_Status = #{produceStatus}
         </if>
-        <if test="bomName != null and bomName != ''">
-            and b.name like concat('%', #{bomName}, '%')
-        </if>
         ) s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskTestUnqualifiedBomMapper.xml

@@ -35,7 +35,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_user,create_time,update_time,update_user,bom_num,no,
-        task_id, task_no, order_id, order_no, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code
+        task_id, task_no, order_id, order_no,order_name, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code,procedureNo,procedureName,addOrderName
     </sql>
 
     <!-- 分页 -->
@@ -43,7 +43,14 @@
         select
         <include refid="Base_Column_List"/>
         from (
-        select a.* from imcs_t_task_test_unqualified_bom a
+        SELECT
+        a.*, p. NO procedureNo,
+        p. NAME procedureName,
+        o.order_name addOrderName
+        FROM
+        imcs_t_task_test_unqualified_bom a
+        LEFT JOIN imcs_b_bom_procedure p ON a.procedure_id = p.id
+        LEFT JOIN imcs_o_order o ON a.add_order_id = o.id
         ) s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/OrderProductController.java

@@ -2,7 +2,9 @@ package com.github.zuihou.business.controller.operationManagementCenter;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.github.zuihou.base.request.PageParams;
 import com.github.zuihou.business.operationManagementCenter.dto.PlanPageDTO;
 import com.github.zuihou.business.operationManagementCenter.entity.Order;
@@ -28,6 +30,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -60,16 +63,12 @@ public class OrderProductController extends SuperController<OrderProductService,
         LbqWrapper<OrderProduct> wrapper = wrap.lambda();
         OrderProduct orderProduct = BeanUtil.toBean(data, OrderProduct.class);
 
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), OrderProduct.class);
         //构建查询参数
-//        eq(OrderProduct::,plan.getAuditStatus())
-                /*.eq(Plan::getSource,plan.getSource())
-                .eq(Plan::getCustId,plan.getCustId())*/
-//                .eq(Plan::getOrderId,plan.getOrderId())
-//                .eq(Plan::getDraftFlag,plan.getDraftFlag())
-//        .geHeader(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_st())?null: LocalDateTime.parse(order.getDeliveryTime_st()))
-//                .leFooter(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_ed())?null:LocalDateTime.parse(order.getDeliveryTime_ed()))
-        wrapper.  orderByDesc(OrderProduct::getCreateTime);
-        baseService.pageList(page,orderProduct.getOrderNo(),orderProduct.getBomName(),orderProduct.getProduceStatus(),wrapper);
+        wrapper.like(StringUtil.isNotEmpty(orderProduct.getOrderNo()),OrderProduct::getOrderNo, orderProduct.getOrderNo())
+                .like(StringUtil.isNotEmpty(orderProduct.getBomName()),OrderProduct::getBomName, orderProduct.getBomName()).orderByDesc(OrderProduct::getCreateTime);
+
+        baseService.pageList(page,orderProduct.getProduceStatus(), wrapper);
 
     }
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/ZZoneController.java

@@ -85,6 +85,22 @@ public class ZZoneController extends SuperController<ZZoneService, Long, ZZone,
         return success(baseService.list(queryWrapper));
     }
 
+    @ApiOperation(value = "查询区域管理", notes = "查询区域管理")
+    @GetMapping("/zoneListExceptBz")
+    public R<List<ZZone>> zoneListExceptBz() {
+        Long userId = BaseContextHandler.getUserId();
+        //获取用户权限访问机构
+        Map<String, Object> orgMap = userService.getDataScopeById(userId);
+        List<Long> orgIds = orgMap.containsKey("orgIds")? (List)orgMap.get("orgIds") : Lists.newArrayList();
+        QueryWrapper<ZZone> queryWrapper = new QueryWrapper();
+        if(CollectionUtil.isNotEmpty(orgIds)){
+            queryWrapper = new QueryWrapper<ZZone>().in("org_id", orgIds);
+        }
+        //取出掉保障
+        queryWrapper.notLike("name","保障");
+        return success(baseService.list(queryWrapper));
+    }
+
     @ApiOperation(value = "查询区域管理", notes = "查询区域管理")
     @GetMapping("/allSelect")
     public R<List<ZZone>> allSelect() {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/OrderProduct.java

@@ -188,13 +188,15 @@ public class OrderProduct extends Entity<Long> {
     @Excel(name = "生产状态(1-待生产2-生产中3-暂停4-已完成)")
     private String produceStatus;
 
-
     @ApiModelProperty(value = "不合格品数量")
     @TableField(exist = false)
     @Excel(name = "不合格品数量")
     private Integer unqualifiedCount;
 
-
+    @ApiModelProperty(value = "合格品数量")
+    @TableField(exist = false)
+    @Excel(name = "合格品数量")
+    private Integer qualifiedCount;
 
     @ApiModelProperty(value = "补单次")
     @TableField(exist = false)
@@ -202,6 +204,11 @@ public class OrderProduct extends Entity<Long> {
     private Integer addOrderCount;
 
 
+    @ApiModelProperty(value = "完成零件数")
+    @TableField(exist = false)
+    @Excel(name = "完成零件数")
+    private Integer completeNum;
+
     @TableField(exist = false)
     private String deliveryTime_st;
     @TableField(exist = false)

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TTaskTestUnqualifiedBom.java

@@ -58,6 +58,15 @@ public class TTaskTestUnqualifiedBom extends Entity<Long> {
     @TableField(value = "no", condition = LIKE)
     @Excel(name = "编号")
     private String no;
+
+
+    @TableField(exist = false)
+    private String procedureNo;
+
+    @TableField(exist = false)
+    private String procedureName;
+
+
     /**
      * 订单ID
      */
@@ -96,6 +105,11 @@ public class TTaskTestUnqualifiedBom extends Entity<Long> {
     @Excel(name = "订单名称")
     private String orderName;
 
+
+    @TableField(exist = false)
+    private String addOrderName;
+
+
     /**
      * 计划ID
      */