Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_p2_api

Dockerfile

@@ -1,6 +1,5 @@
 # 基础镜像
 FROM ibm-semeru-runtimes:open-8-jre
-
 # 创建挂载目录
 RUN mkdir -p /jar
 

src/main/resources/mybatis/business/BizProductionPlanDetailMapper.xml

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="transactionCode != null  and transactionCode != ''"> AND transaction_code = #{transactionCode}</if>
             <if test="productionPlanNo != null  and productionPlanNo != ''"> AND production_plan_no  LIKE CONCAT('%', #{productionPlanNo}, '%')</if>
             <if test="lineNumber != null "> AND line_number = #{lineNumber}</if>
+            <if test="lotCodeStatusCode != null "> AND lot_code_status_code = #{lotCodeStatusCode}</if>
             <if test="productCode != null  and productCode != ''"> AND product_code = #{productCode}</if>
             <if test="specification != null  and specification != ''"> AND specification = #{specification}</if>
             <if test="drawingNumber != null  and drawingNumber != ''"> AND drawing_number = #{drawingNumber}</if>