春风项目四线(合箱线、总装线)
懒羊羊
2024-01-17 1de44b26c41de44548684bfb475d40fc52af9b71
工单优化
已修改5个文件
25 ■■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/bs/orderScheduling/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/om/productionOrde/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.List;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jcdm.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,8 +45,13 @@
    public List<BsOrderScheduling> selectBsOrderSchedulingList(BsOrderScheduling bsOrderScheduling)
    {
//        if(StrUtil.isNotBlank(bsOrderScheduling.getOperateTime())){
////            String[] dateArray = gson.fromJson(jsonString, String[].class);
//        if(bsOrderScheduling.getOperateTime()!=null){
//            ObjectMapper objectMapper = new ObjectMapper();
//            try {
//                String[] dateArray = objectMapper.readValue(bsOrderScheduling.getOperateTime(), String[].class);
//            }catch (Exception e){
//
//            }
//
//        }
        return bsOrderSchedulingMapper.selectBsOrderSchedulingList(bsOrderScheduling);
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -194,7 +194,9 @@
            } catch (Exception e) {
                return error("接收失败!请检查通知单号");
            }
        }else {
            return warn("该订单已接收完毕,不能重复接收!");
        }
        return warn("该订单已接收完毕,不能重复接收!");
        return AjaxResult.success("接收成功!");
    }
}
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java
@@ -60,8 +60,8 @@
    public int insertOmProductionOrdeInfo(OmProductionOrdeInfo omProductionOrdeInfo)
    {
        omProductionOrdeInfo.setCreateTime(DateUtils.getNowDate());
        Integer streamNumber = omProductionOrdeInfoMapper.getMaxStreamNumber();
        omProductionOrdeInfo.setStreamNumber(String.valueOf(streamNumber+1));
      /*  Integer streamNumber = omProductionOrdeInfoMapper.getMaxStreamNumber();*/
       /* omProductionOrdeInfo.setStreamNumber(String.valueOf(streamNumber+1));*/
        return omProductionOrdeInfoMapper.insertOmProductionOrdeInfo(omProductionOrdeInfo);
    }
jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -516,8 +516,8 @@
    },
    /** 搜索按钮操作 */
    handleQuery() {
      // this.queryParams.pageNum = 1;
      // this.getList();
      this.queryParams.pageNum = 1;
      this.getList();
      this.$modal.msgSuccess(this.queryParams.operateTime);
    },
    /** 重置按钮操作 */
jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -552,7 +552,8 @@
    getProductionNotice(){
      getProductionNotice(this.queryParams).then(response => {
        this.$modal.msgSuccess(response.data.msg);
        this.$modal.msgSuccess(response.msg);
        this.queryParams = {}
        this.getList();
      });