Merge remote-tracking branch 'origin/master'

cl

2024-01-18 d18622be3bf4c48e9cf17bc4d3254245438ed272

Merge remote-tracking branch 'origin/master'

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java

@@ -114,6 +114,36 @@
    @Excel(name = "CVT报工")
    private String report30;

    private String[] dateConditions;

    private String startTime;

    private String endTime;

    public String[] getDateConditions() {
        return dateConditions;
    }

    public void setDateConditions(String[] dateConditions) {
        this.dateConditions = dateConditions;
    }

    public String getStartTime() {
        return startTime;
    }

    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    public String getReport30() {
        return report30;
    }

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java

@@ -44,16 +44,11 @@
    @Override
    public List<BsOrderScheduling> selectBsOrderSchedulingList(BsOrderScheduling bsOrderScheduling)
    {

//        if(bsOrderScheduling.getOperateTime()!=null){
//            ObjectMapper objectMapper = new ObjectMapper();
//            try {
//                String[] dateArray = objectMapper.readValue(bsOrderScheduling.getOperateTime(), String[].class);
//            }catch (Exception e){
//
//            }
//
//        }
        if(bsOrderScheduling.getDateConditions()!=null){
            String[] conditions = bsOrderScheduling.getDateConditions();
            bsOrderScheduling.setStartTime(conditions[0]);
            bsOrderScheduling.setEndTime(conditions[1]);
        }
        return bsOrderSchedulingMapper.selectBsOrderSchedulingList(bsOrderScheduling);
    }


 jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml

@@ -66,6 +66,8 @@
            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
            <if test="report30 != null  and report30 != ''"> and report_30 = #{report30}</if>
            <if test="dateConditions != null  and dateConditions != ''"> and operate_time BETWEEN #{startTime} AND #{endTime}</if>


        </where>
    </select>

 jcdm-ui/src/views/main/bs/orderScheduling/index.vue

@@ -86,7 +86,7 @@
        </el-form-item>
        <el-form-item label="操作时间" prop="operateTime">
          <el-date-picker
            v-model="queryParams.operateTime"
            v-model="queryParams.dateConditions"
            type="datetimerange"
            :picker-options="pickerOptions"
            value-format="yyyy-MM-dd HH:mm:ss"
@@ -411,7 +411,7 @@
        combinedBoxTime: null,
        finalAssemblyTime: null,
        operator: null,
        operateTime: '',
        operateTime: null,
        status: null,
        spareField1: null,
        spareField2: null,
@@ -419,7 +419,8 @@
        spareField4: null,
        createUser: null,
        updateUser: null,
        remarks: null
        remarks: null,
        dateConditions: [],
      },
      // 表单参数
      form: {},
@@ -472,6 +473,7 @@
    /** 查询订单排产列表 */
    getList() {
      this.loading = true;
      console.log(this.queryParams)
      listOrderScheduling(this.queryParams).then(response => {
        this.orderSchedulingList = response.rows;
        this.total = response.total;

 jcdm-ui/src/views/main/om/productionOrde/index.vue

@@ -793,7 +793,7 @@
          this.saveBoxCode()
        }else {
          let maxNumValue = response.rows[0].maxnumValue;
          if(startCode<maxNumValue){
          if(startCode<=maxNumValue){
            this.$message.error('箱体条码重复，请重新输入起始编号！');
          }else {
            this.saveBoxCode()