#

1

昨天 230b5f1b455ce5d89ada908fcf79ca8d18eb0e1d

#

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

@@ -29,7 +29,7 @@
    @Autowired
    private ArmRulesHandler armRulesHandler;

    @Scheduled(cron = "0 0 * * * ? ")
    @Scheduled(cron = "0/30 * * * * ? ")
    private void execute(){
        List<BasArmRules> basArmRules = basArmRulesService.AllStatusSatisfyBasArmRules(0);
        if (basArmRules.isEmpty()) {

 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java

@@ -130,7 +130,6 @@
                case "PUR_RECEIVEBIll": //已审核收料单查询
//                    jsonObject.put("start_biztime", latestUpdateTime);//业务起始日期
                    jsonObject.put("start_biztime",  "2025-01-01 00:00:00");//业务起始日期

                    jsonObject.put("end_biztime", sdf1.format(now));//业务结束日期
                    jsonObject.put("billno", Arrays.asList("CGSL-251023-000027","CGSL-250811-000028"));
                    jsonObject.put("billstatus", Arrays.asList("C"));//数据状态 [A:暂存, B:已提交, C:已审核]

 src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java

@@ -3,7 +3,7 @@
public enum KingDeeUtilType {
    BD_MATERIAL(0, "物料档案","BD_MATERIAL","","","",1),
    BD_RRGANIZATION(2, "供应商","BD_RRGANIZATION","","","",1),
    PUR_RECEIVEBIll(3, "收料单","PUR_RECEIVEBIll","","","",1),
//    PUR_RECEIVEBIll(3, "收料单","PUR_RECEIVEBIll","","","",1),

    //    STK_InStock(1, "采购入库单","STK_InStock","FRealQty","","",1),
//    PUR_MRB(2, "采购退料单","PUR_MRB","FRMREALQTY","","",1),

 src/main/webapp/static/js/order/order.js

@@ -246,6 +246,10 @@
                        // {field: 'specs', title: '规格'},
                        {field: 'standby1', title: 'po'},
                        {field: 'standby2', title: 'upc'},
                        {field: 'standby3', title: '客户SKU'},
                        {field: 'boxType1', title: '货主名称'},
                        {field: 'boxType2', title: 'upc'},
                        {field: 'boxType3', title: '客户SKU'},
                        {field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        {field: 'workQty', title: '作业数量',  minWidth: 100, width: 100},
                        // {field: 'unit', title: '单位', width: 80},

 src/main/webapp/views/order/order.html

@@ -173,16 +173,23 @@
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">货主：</label>
            <div class="layui-input-block cool-auto-complete">
                <input class="layui-input" name="owner" placeholder="输入货主名称" style="display: none">
                <input id="owner$" name="owner$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入货主名称" onfocus=this.blur() lay-verType="tips" lay-verify="required">
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="locOwnerQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="locOwnerQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
            <div class="layui-input-block">
                <input id="owner" name="owner" placeholder="输入货主" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
                <!--                lay-verify="required"-->
                </div>
            </div>
        </div>
<!--        <div class="layui-form-item">-->
<!--            <label class="layui-form-label">货主：</label>-->
<!--            <div class="layui-input-block cool-auto-complete">-->
<!--                <input class="layui-input" name="owner" placeholder="输入货主名称" style="display: none">-->
<!--                <input id="owner$" name="owner$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入货主名称" onfocus=this.blur() lay-verType="tips" lay-verify="required">-->
<!--                <div class="cool-auto-complete-window">-->
<!--                    <input class="cool-auto-complete-window-input" data-key="locOwnerQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                    <select class="cool-auto-complete-window-select" data-key="locOwnerQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                    </select>-->
<!--                </div>-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-form-item" style="position: relative;">
            <label class="layui-form-label">单据明细：</label>
            <div class="layui-input-block">