#

18516761980

2021-09-10 cfaa0a74bf5a5f87c172f867f2a7371298f4c241

#

 src/main/java/com/zy/asrs/task/WorkLogScheduler.java

@@ -4,6 +4,7 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,7 @@
        for (WrkMast wrkMast : wrkMasts) {
            ReturnT<String> result = workLogHandler.start(wrkMast);
            if (!result.isSuccess()) {
                log.error(result.getMsg());
                log.error("工作档[workNo={}]历史档处理失败", wrkMast.getWrkNo());
            }
        }

 src/main/java/com/zy/common/service/erp/ErpService.java

@@ -113,6 +113,7 @@
                "and isb.FBillNo= ''{2}''";
        sql = MessageFormat.format(sql, increment, Fnumber, FBillNo);
        if (erpSqlServer.update(sql) > 0) {
//            log.error("更新ERP中间表成功===>>[FBillNo:{},Fnumber:{},increment:{}]",FBillNo,Fnumber,increment);
            List<InStockBillEntry> inStockBillEntries = getInStockBillEntry(FBillNo);
            boolean complete = true;
            // 比较单笔资料物料是否全部完成
@@ -137,6 +138,7 @@
            }
            return true;
        } else {
            log.error("更新ERP中间表失败===>>[FBillNo:{},Fnumber:{},increment:{}]",FBillNo,Fnumber,increment);
            return false;
        }
    }

 src/main/java/com/zy/common/service/erp/ErpSqlServer.java

@@ -2,6 +2,7 @@

import com.core.common.Cools;
import com.zy.common.properties.ErpDbProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -19,6 +20,7 @@
 * 简单持久层框架
 * Created by vincent on 2020/11/26
 */
@Slf4j
@Service
public class ErpSqlServer {

@@ -88,6 +90,8 @@
            return pstm.executeUpdate();
        } catch (Exception e) {
            e.printStackTrace();
            log.error("更新ERP中间表失败===>>" + sql);
            log.error("更新ERP中间表失败===>>" + e);
            return 0;
        } finally {
            release();

 src/main/resources/application.yml

@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=xtyasrs
    url: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs
    username: sa
    password: sa@123
  mvc:

 src/main/webapp/views/locMatStatus/locMatStatus.html

@@ -30,13 +30,14 @@
            <option value="0">待检</option>
            <option value="1">良品</option>
            <option value="2">不良品</option>
            <option value="3">短装</option>
        </select>
    </div>
    <!--<div class="layui-inline">-->
        <!--<div class="layui-input-inline">-->
            <!--<input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">-->
        <!--</div>-->
    <!--</div>-->
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="mnemonic" placeholder="生产单号" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
@@ -59,6 +60,8 @@
    <span style="color: green">良品</span>
    {{# } else if(d.matStatus === '2'){ }}
    <span style="color: red">不良品</span>
    {{# } else if(d.matStatus === '3'){ }}
    <span style="color: blue">短装</span>
    {{#  } else { }}
    {{#  } }}
</script>

 src/main/webapp/views/pakStore/matStatus.html

@@ -13,6 +13,7 @@
    <select class="cool-auto-complete-window-select" id="matStatusChoose" lay-filter="matStatusChoose" style="width: 250px; height: 30px">
        <option value="1">良品</option>
        <option value="2">不良品</option>
        <option value="3">短装</option>
    </select>

</form>