Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev

yun-zuoyi
钮海涛 5 years ago committed by nancy.li
commit 35c1114230

@ -3857,7 +3857,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRINT_TYPE {
SN(10, "SN");
SN(10, "SN"),
PACKAGE_NO(20, "PACKAGE_NO");
private int value;
private String description;

@ -1301,6 +1301,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(),
"qualityDate", result, false,false);
if (wmsStockSn.getIsValid() != null) {

Loading…
Cancel
Save