1

zhang

8 小时以前 74b35955ebfd42f8a9b31f56a3a9ac5181c96443

1

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

@@ -7,6 +7,8 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.OutLocInfoParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,9 @@

    @Autowired
    private OpenService openService;

    @Autowired
    private LocDetlMapper locDetlMapper;

    @PostMapping("/scrk")
    @AppAuth(memo = "GWMS调用生成入库工作档")
@@ -503,13 +508,31 @@
    }

    /**
     * 是否合格
     */
    @PostMapping("/check/auth/v1")
    @AppAuth(memo = "检验是否合格")
    public synchronized R check(@RequestHeader(required = false) String appkey,
                                      @RequestBody UnQualifiedOrderConfirmParam param,
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        List<UnQualifiedOrderConfirmParam.VolumeNumber> volumeNumbers = param.getVolumeNumbers();
        for (UnQualifiedOrderConfirmParam.VolumeNumber v :volumeNumbers){
            if (!Cools.isEmpty(v.getVolumeNumber())&&!Cools.isEmpty(param.getQualified())){
                locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified());
            }
        }
        return R.ok(param);
    }

    /**
     * 退库单（出库）
     */
    @PostMapping("/unQualifiedOrder/auth/v1")
    @AppAuth(memo = "不合格品退库单单据下发")
    public synchronized R unqualifiedOrder(@RequestHeader(required = false) String appkey,
                                      @RequestBody UnQualifiedOrderConfirmParam param,
                                      HttpServletRequest request) {
                                           @RequestBody UnQualifiedOrderConfirmParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.unQualifiedOrder(param);
        return R.ok(param);

 src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java

@@ -8,6 +8,8 @@
public class UnQualifiedOrderConfirmParam {
    private String orderNumber; //组货单号
    private List<VolumeNumber> volumeNumbers; // 多个包装组号
    private String qualified; // 1合格2不合格，3不合格单放行


    private String memo;//备注
    @Data

 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java

@@ -112,4 +112,11 @@
     * @param qualified 校验结果 合格/不合格
     */
    void updateQualifiedByRollNo(@Param("rollNo") String rollNo, @Param("qualified") String qualified);

    /**
     * 更新成品校验结果
     * @param brand 包装组号
     * @param qualified 校验结果 合格/不合格
     */
    void updateQualifiedByBrand(@Param("brand") String brand, @Param("qualified") String qualified);
}

 src/main/resources/mapper/LocDetlMapper.xml

@@ -447,5 +447,7 @@
        update asr_loc_detl set three_code = #{qualified} where model = #{rollNo}
    </update>


    <update id="updateQualifiedByBrand">
        update asr_loc_detl set three_code = #{qualified} where brand = #{brand}
    </update>
</mapper>

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

@@ -152,9 +152,9 @@

<!-- 行工具栏 -->
<script type="text/html" id="operate">
<!--    {{#if (d.enableQty > 0){ }}-->
<!--    <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>出库</a>-->
<!--    {{# } }}-->
    {{#if (d.enableQty > 0){ }}
    <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>出库</a>
    {{# } }}
</script>

<!-- 出库预览 -->

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

@@ -152,9 +152,9 @@

<!-- 行工具栏 -->
<script type="text/html" id="operate">
<!--    {{#if (d.enableQty > 0){ }}-->
<!--    <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>出库</a>-->
<!--    {{# } }}-->
    {{#if (d.enableQty > 0){ }}
    <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>出库</a>
    {{# } }}
</script>

<!-- 出库预览 -->

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

@@ -152,9 +152,9 @@

<!-- 行工具栏 -->
<script type="text/html" id="operate">
<!--    {{#if (d.enableQty > 0){ }}-->
<!--    <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>出库</a>-->
<!--    {{# } }}-->
    {{#if (d.enableQty > 0){ }}
    <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>出库</a>
    {{# } }}
</script>

<!-- 出库预览 -->