#

zyx

2024-05-31 3f22772b5b70f6d0808e7e7c8f16793fb0ea47bb

#

 src/main/java/com/zy/asrs/controller/PlaController.java

@@ -9,6 +9,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
@@ -50,6 +51,9 @@
    private PlaLogService plaLogService;
    @Autowired
    private MatService matService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;


    @RequestMapping(value = "/pla/list/auth")
    @ManagerAuth
@@ -387,9 +391,10 @@
        }
    }

    @Synchronized
    private R addPakOUT(PlaQty plaQty,Long userId){
        ManPakOut manPakOut=new ManPakOut();
        manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+System.currentTimeMillis());
        manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+String.valueOf(snowflakeIdWorker.nextId()));
        manPakOut.setWrkSts((long)1);
        manPakOut.setAnfme(plaQty.getOrderWeight());
        manPakOut.setMaktx(plaQty.getBrand());

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8081
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@
  compression:

 src/main/webapp/views/saasLog/saasLog.html

@@ -42,6 +42,16 @@
                            <input class="layui-input" type="text" name="workshop" placeholder="车间" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="batch" placeholder="批号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="package_no" placeholder="包号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline" style="width: 300px">
                        <!--            <div class="layui-input-inline">-->
                        <!--                <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">-->