#

tqs

2024-07-05 652422ee99ff84d5198d770d8f70766dd591e686

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java

@@ -22,6 +22,11 @@
    //组托物料
    private List<CombMat> combMats;

    /*
    满板
     */
    private String fullPlt;

    @Data
    public static class CombMat {


 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java

@@ -265,6 +265,12 @@
    @ApiModelProperty(value= "授权商户")
    private Long hostId;

    /**
     * 满板(checkBox)
     */
    @ApiModelProperty(value= "满板(checkBox)")
    private String fullPlt;

    public WaitPakin() {}

    public WaitPakin(String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java

@@ -262,6 +262,12 @@
    @ApiModelProperty(value= "授权商户")
    private Long hostId;

    /**
     * 满板(checkBox)
     */
    @ApiModelProperty(value= "满板(checkBox)")
    private String fullPlt;

    public WaitPakinLog() {}

    public WaitPakinLog(Long id,String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java

@@ -99,6 +99,7 @@
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setFullPlt(param.getFullPlt());
                if (!waitPakinService.save(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java

@@ -131,6 +131,7 @@
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        locMast.setPic(wrkMast.getPic());
                        locMast.setFullPlt(wrkMast.getFullPlt());
                        if (!locMastService.updateById(locMast)) {
                            exceptionHandle("全板入库 ===>> 修改库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        }

 zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -59,12 +59,12 @@
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true, width: 160}
            // ,{field: 'memo', align: 'center',title: '备注'}
            //
            // ,{field: 'fullPlt', align: 'center',title: '满板', templet:function(row){
            //         var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
            //         if(row.fullPlt === 'Y'){html += " checked ";}
            //         html += ">";
            //         return html;
            //     }}
            ,{field: 'fullPlt', align: 'center',title: '满板', templet:function(row){
                    var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.fullPlt === 'Y'){html += " checked ";}
                    html += ">";
                    return html;
                }}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:250}
        ]],